gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[GNUnet-SVN] r807 - in gnunet-gtk: . m4 pixmaps po src


From: grothoff
Subject: [GNUnet-SVN] r807 - in gnunet-gtk: . m4 pixmaps po src
Date: Tue, 24 May 2005 04:22:40 -0700 (PDT)

Author: grothoff
Date: 2005-05-24 04:20:25 -0700 (Tue, 24 May 2005)
New Revision: 807

Added:
   gnunet-gtk/ABOUT-NLS
   gnunet-gtk/COPYING
   gnunet-gtk/INSTALL
   gnunet-gtk/m4/
   gnunet-gtk/m4/codeset.m4
   gnunet-gtk/m4/gettext.m4
   gnunet-gtk/m4/glibc2.m4
   gnunet-gtk/m4/glibc21.m4
   gnunet-gtk/m4/gtk-2.0.m4
   gnunet-gtk/m4/iconv.m4
   gnunet-gtk/m4/intdiv0.m4
   gnunet-gtk/m4/intmax.m4
   gnunet-gtk/m4/inttypes-pri.m4
   gnunet-gtk/m4/inttypes.m4
   gnunet-gtk/m4/inttypes_h.m4
   gnunet-gtk/m4/isc-posix.m4
   gnunet-gtk/m4/lcmessage.m4
   gnunet-gtk/m4/lib-ld.m4
   gnunet-gtk/m4/lib-link.m4
   gnunet-gtk/m4/lib-prefix.m4
   gnunet-gtk/m4/longdouble.m4
   gnunet-gtk/m4/longlong.m4
   gnunet-gtk/m4/nls.m4
   gnunet-gtk/m4/po.m4
   gnunet-gtk/m4/printf-posix.m4
   gnunet-gtk/m4/progtest.m4
   gnunet-gtk/m4/signed.m4
   gnunet-gtk/m4/size_max.m4
   gnunet-gtk/m4/stdint_h.m4
   gnunet-gtk/m4/uintmax_t.m4
   gnunet-gtk/m4/ulonglong.m4
   gnunet-gtk/m4/wchar_t.m4
   gnunet-gtk/m4/wint_t.m4
   gnunet-gtk/m4/xsize.m4
   gnunet-gtk/pixmaps/
   gnunet-gtk/pixmaps/gnunet_logo.png
   gnunet-gtk/pixmaps/info.png
   gnunet-gtk/po/LINGUAS
   gnunet-gtk/po/Makefile.in
   gnunet-gtk/po/Makefile.in.in
   gnunet-gtk/po/Makevars
   gnunet-gtk/po/POTFILES
   gnunet-gtk/po/Rules-quot
   gnunet-gtk/po/address@hidden
   gnunet-gtk/po/address@hidden
   gnunet-gtk/po/address@hidden
   gnunet-gtk/po/address@hidden
   gnunet-gtk/po/gnunet-gtk.pot
   gnunet-gtk/po/insert-header.sin
   gnunet-gtk/po/stamp-po
   gnunet-gtk/src/gettext.h
   gnunet-gtk/todo
Removed:
   gnunet-gtk/strings.txt
Modified:
   gnunet-gtk/ChangeLog
   gnunet-gtk/Makefile.am
   gnunet-gtk/NEWS
   gnunet-gtk/README
   gnunet-gtk/configure.ac
   gnunet-gtk/gnunet-gtk.glade
   gnunet-gtk/po/ChangeLog
   gnunet-gtk/src/Makefile.am
   gnunet-gtk/src/callbacks.c
   gnunet-gtk/src/callbacks.h
   gnunet-gtk/src/interface.c
   gnunet-gtk/src/interface.h
   gnunet-gtk/src/main.c
Log:
hacking

Added: gnunet-gtk/ABOUT-NLS
===================================================================
--- gnunet-gtk/ABOUT-NLS        2005-05-24 11:18:12 UTC (rev 806)
+++ gnunet-gtk/ABOUT-NLS        2005-05-24 11:20:25 UTC (rev 807)
@@ -0,0 +1 @@
+link /usr/share/gettext/ABOUT-NLS
\ No newline at end of file


Property changes on: gnunet-gtk/ABOUT-NLS
___________________________________________________________________
Name: svn:special
   + *

Added: gnunet-gtk/COPYING
===================================================================
--- gnunet-gtk/COPYING  2005-05-24 11:18:12 UTC (rev 806)
+++ gnunet-gtk/COPYING  2005-05-24 11:20:25 UTC (rev 807)
@@ -0,0 +1,340 @@
+                   GNU GENERAL PUBLIC LICENSE
+                      Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                           Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                   GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+                           NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+                    END OF TERMS AND CONDITIONS
+
+           How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year  name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General
+Public License instead of this License.

Modified: gnunet-gtk/ChangeLog
===================================================================
--- gnunet-gtk/ChangeLog        2005-05-24 11:18:12 UTC (rev 806)
+++ gnunet-gtk/ChangeLog        2005-05-24 11:20:25 UTC (rev 807)
@@ -0,0 +1,3 @@
+
+Mon May 23 11:06:02 EST 2005
+    Started serious coding on glade-based gnunet-gtk.

Added: gnunet-gtk/INSTALL
===================================================================
--- gnunet-gtk/INSTALL  2005-05-24 11:18:12 UTC (rev 806)
+++ gnunet-gtk/INSTALL  2005-05-24 11:20:25 UTC (rev 807)
@@ -0,0 +1,229 @@
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002 Free Software
+Foundation, Inc.
+
+   This file is free documentation; the Free Software Foundation gives
+unlimited permission to copy, distribute and modify it.
+
+Basic Installation
+==================
+
+   These are generic installation instructions.
+
+   The `configure' shell script attempts to guess correct values for
+various system-dependent variables used during compilation.  It uses
+those values to create a `Makefile' in each directory of the package.
+It may also create one or more `.h' files containing system-dependent
+definitions.  Finally, it creates a shell script `config.status' that
+you can run in the future to recreate the current configuration, and a
+file `config.log' containing compiler output (useful mainly for
+debugging `configure').
+
+   It can also use an optional file (typically called `config.cache'
+and enabled with `--cache-file=config.cache' or simply `-C') that saves
+the results of its tests to speed up reconfiguring.  (Caching is
+disabled by default to prevent problems with accidental use of stale
+cache files.)
+
+   If you need to do unusual things to compile the package, please try
+to figure out how `configure' could check whether to do them, and mail
+diffs or instructions to the address given in the `README' so they can
+be considered for the next release.  If you are using the cache, and at
+some point `config.cache' contains results you don't want to keep, you
+may remove or edit it.
+
+   The file `configure.ac' (or `configure.in') is used to create
+`configure' by a program called `autoconf'.  You only need
+`configure.ac' if you want to change it or regenerate `configure' using
+a newer version of `autoconf'.
+
+The simplest way to compile this package is:
+
+  1. `cd' to the directory containing the package's source code and type
+     `./configure' to configure the package for your system.  If you're
+     using `csh' on an old version of System V, you might need to type
+     `sh ./configure' instead to prevent `csh' from trying to execute
+     `configure' itself.
+
+     Running `configure' takes awhile.  While running, it prints some
+     messages telling which features it is checking for.
+
+  2. Type `make' to compile the package.
+
+  3. Optionally, type `make check' to run any self-tests that come with
+     the package.
+
+  4. Type `make install' to install the programs and any data files and
+     documentation.
+
+  5. You can remove the program binaries and object files from the
+     source code directory by typing `make clean'.  To also remove the
+     files that `configure' created (so you can compile the package for
+     a different kind of computer), type `make distclean'.  There is
+     also a `make maintainer-clean' target, but that is intended mainly
+     for the package's developers.  If you use it, you may have to get
+     all sorts of other programs in order to regenerate files that came
+     with the distribution.
+
+Compilers and Options
+=====================
+
+   Some systems require unusual options for compilation or linking that
+the `configure' script does not know about.  Run `./configure --help'
+for details on some of the pertinent environment variables.
+
+   You can give `configure' initial values for configuration parameters
+by setting variables in the command line or in the environment.  Here
+is an example:
+
+     ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
+
+   *Note Defining Variables::, for more details.
+
+Compiling For Multiple Architectures
+====================================
+
+   You can compile the package for more than one kind of computer at the
+same time, by placing the object files for each architecture in their
+own directory.  To do this, you must use a version of `make' that
+supports the `VPATH' variable, such as GNU `make'.  `cd' to the
+directory where you want the object files and executables to go and run
+the `configure' script.  `configure' automatically checks for the
+source code in the directory that `configure' is in and in `..'.
+
+   If you have to use a `make' that does not support the `VPATH'
+variable, you have to compile the package for one architecture at a
+time in the source code directory.  After you have installed the
+package for one architecture, use `make distclean' before reconfiguring
+for another architecture.
+
+Installation Names
+==================
+
+   By default, `make install' will install the package's files in
+`/usr/local/bin', `/usr/local/man', etc.  You can specify an
+installation prefix other than `/usr/local' by giving `configure' the
+option `--prefix=PATH'.
+
+   You can specify separate installation prefixes for
+architecture-specific files and architecture-independent files.  If you
+give `configure' the option `--exec-prefix=PATH', the package will use
+PATH as the prefix for installing programs and libraries.
+Documentation and other data files will still use the regular prefix.
+
+   In addition, if you use an unusual directory layout you can give
+options like `--bindir=PATH' to specify different values for particular
+kinds of files.  Run `configure --help' for a list of the directories
+you can set and what kinds of files go in them.
+
+   If the package supports it, you can cause programs to be installed
+with an extra prefix or suffix on their names by giving `configure' the
+option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
+
+Optional Features
+=================
+
+   Some packages pay attention to `--enable-FEATURE' options to
+`configure', where FEATURE indicates an optional part of the package.
+They may also pay attention to `--with-PACKAGE' options, where PACKAGE
+is something like `gnu-as' or `x' (for the X Window System).  The
+`README' should mention any `--enable-' and `--with-' options that the
+package recognizes.
+
+   For packages that use the X Window System, `configure' can usually
+find the X include and library files automatically, but if it doesn't,
+you can use the `configure' options `--x-includes=DIR' and
+`--x-libraries=DIR' to specify their locations.
+
+Specifying the System Type
+==========================
+
+   There may be some features `configure' cannot figure out
+automatically, but needs to determine by the type of machine the package
+will run on.  Usually, assuming the package is built to be run on the
+_same_ architectures, `configure' can figure that out, but if it prints
+a message saying it cannot guess the machine type, give it the
+`--build=TYPE' option.  TYPE can either be a short name for the system
+type, such as `sun4', or a canonical name which has the form:
+
+     CPU-COMPANY-SYSTEM
+
+where SYSTEM can have one of these forms:
+
+     OS KERNEL-OS
+
+   See the file `config.sub' for the possible values of each field.  If
+`config.sub' isn't included in this package, then this package doesn't
+need to know the machine type.
+
+   If you are _building_ compiler tools for cross-compiling, you should
+use the `--target=TYPE' option to select the type of system they will
+produce code for.
+
+   If you want to _use_ a cross compiler, that generates code for a
+platform different from the build platform, you should specify the
+"host" platform (i.e., that on which the generated programs will
+eventually be run) with `--host=TYPE'.
+
+Sharing Defaults
+================
+
+   If you want to set default values for `configure' scripts to share,
+you can create a site shell script called `config.site' that gives
+default values for variables like `CC', `cache_file', and `prefix'.
+`configure' looks for `PREFIX/share/config.site' if it exists, then
+`PREFIX/etc/config.site' if it exists.  Or, you can set the
+`CONFIG_SITE' environment variable to the location of the site script.
+A warning: not all `configure' scripts look for a site script.
+
+Defining Variables
+==================
+
+   Variables not defined in a site shell script can be set in the
+environment passed to `configure'.  However, some packages may run
+configure again during the build, and the customized values of these
+variables may be lost.  In order to avoid this problem, you should set
+them in the `configure' command line, using `VAR=value'.  For example:
+
+     ./configure CC=/usr/local2/bin/gcc
+
+will cause the specified gcc to be used as the C compiler (unless it is
+overridden in the site shell script).
+
+`configure' Invocation
+======================
+
+   `configure' recognizes the following options to control how it
+operates.
+
+`--help'
+`-h'
+     Print a summary of the options to `configure', and exit.
+
+`--version'
+`-V'
+     Print the version of Autoconf used to generate the `configure'
+     script, and exit.
+
+`--cache-file=FILE'
+     Enable the cache: use and save the results of the tests in FILE,
+     traditionally `config.cache'.  FILE defaults to `/dev/null' to
+     disable caching.
+
+`--config-cache'
+`-C'
+     Alias for `--cache-file=config.cache'.
+
+`--quiet'
+`--silent'
+`-q'
+     Do not print messages saying which checks are being made.  To
+     suppress all normal output, redirect it to `/dev/null' (any error
+     messages will still be shown).
+
+`--srcdir=DIR'
+     Look for the package's source code in directory DIR.  Usually
+     `configure' can determine that directory automatically.
+
+`configure' also accepts some other, not widely useful, options.  Run
+`configure --help' for more details.
+

Modified: gnunet-gtk/Makefile.am
===================================================================
--- gnunet-gtk/Makefile.am      2005-05-24 11:18:12 UTC (rev 806)
+++ gnunet-gtk/Makefile.am      2005-05-24 11:20:25 UTC (rev 807)
@@ -1,9 +1,9 @@
 ## Process this file with automake to produce Makefile.in
 
-SUBDIRS = intl po src
+SUBDIRS = po src
 
 EXTRA_DIST = \
-       autogen.sh \
+       bootstrap \
        gnunet-gtk.glade
 
 install-data-local:
@@ -27,3 +27,5 @@
          done \
        fi
 
+
+ACLOCAL_AMFLAGS = -I m4

Modified: gnunet-gtk/NEWS
===================================================================
--- gnunet-gtk/NEWS     2005-05-24 11:18:12 UTC (rev 806)
+++ gnunet-gtk/NEWS     2005-05-24 11:20:25 UTC (rev 807)
@@ -0,0 +1 @@
+See ChangeLog.

Modified: gnunet-gtk/README
===================================================================
--- gnunet-gtk/README   2005-05-24 11:18:12 UTC (rev 806)
+++ gnunet-gtk/README   2005-05-24 11:20:25 UTC (rev 807)
@@ -0,0 +1,28 @@
+This is the GNUnet GTK user interface.  In order
+to compile or run this code, you need to first 
+install the main GNUnet codebase.
+
+GNUnet GTK requires GTK 2.4 or higher.
+
+This software is currently alpha quality: 
+* we're using glade for the first time
+* we're shipping gnunet-gtk seperately from GNUnet
+  for the first time
+* the UI code was largely rewritten
+* the GNUnet core was largely rewritten
+
+So, please don't expect everything to just work
+and report bugs (or better, send patches :-)).
+
+
+Stay tuned
+==========
+
+* http://www.gnu.org/software/GNUnet/
+* http://gnunet.org/
+* https://gnunet.org/mantis/
+* https://gnunet.org/drupal/
+* http://mail.gnu.org/mailman/listinfo/gnunet-developers
+* http://mail.gnu.org/mailman/listinfo/help-gnunet
+* http://mail.gnu.org/mailman/listinfo/info-gnunet
+

Modified: gnunet-gtk/configure.ac
===================================================================
--- gnunet-gtk/configure.ac     2005-05-24 11:18:12 UTC (rev 806)
+++ gnunet-gtk/configure.ac     2005-05-24 11:20:25 UTC (rev 807)
@@ -1,57 +1,209 @@
-dnl Process this file with autoconf to produce a configure script.
-
-AC_INIT(configure.in)
-AM_INIT_AUTOMAKE(gnunet-gtk, 0.1)
+# This file is part of GNUnet.
+# (C) 2001, 2002, 2003, 2004, 2005 Christian Grothoff (and other contributing 
authors)
+#
+# GNUnet is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published
+# by the Free Software Foundation; either version 2, or (at your
+# option) any later version.
+#
+# GNUnet is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GNUnet; see the file COPYING.  If not, write to the
+# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+# Boston, MA 02111-1307, USA.
+#
+#
+# Process this file with autoconf to produce a configure script.
+#
+AC_PREREQ(2.57)
+AC_INIT([gnunet-gtk],[0.0.0],address@hidden)
+AM_INIT_AUTOMAKE([gnunet-gtk], [0.0.0])
 AM_CONFIG_HEADER(config.h)
 
+AH_TOP([#define _GNU_SOURCE  1])
+
 AC_ISC_POSIX
+AC_PROG_AWK
 AC_PROG_CC
+
+
+AC_PROG_CPP
+AC_PROG_INSTALL
+AC_PROG_LN_S
+AC_PROG_MAKE_SET
+AC_PROG_CC
 AM_PROG_CC_STDC
+AC_PROG_CXX
 AC_HEADER_STDC
+AC_CANONICAL_HOST
 
-AM_PATH_GTK(1.2.0, ,
-            AC_MSG_ERROR(Cannot find GTK: Is gtk-config in path?))
+AC_SYS_LARGEFILE
+AC_FUNC_FSEEKO
 
-dnl Add the languages which your application supports here.
-ALL_LINGUAS=""
-AM_GNU_GETTEXT
+# check for gtk >= 2.4.0
+AC_MSG_CHECKING(for gtk)
+AM_PATH_GTK_2_0(2.4.0,without_gtk=false,without_gtk=true)
+AM_CONDITIONAL(HAVE_GTK, test x$without_gtk != xtrue)
+if test $without_gtk != true
+then
+ AC_DEFINE_UNQUOTED([HAVE_GTK], 1, [We have GTK])
+else
+ AC_MSG_ERROR(Cannot find GTK: Is gtk-config in path?)
+fi
 
-dnl Set PACKAGE_LOCALE_DIR in config.h.
+
+CFLAGS="-Wall $CFLAGS"
+# use '-fno-strict-aliasing', but only if the compiler can take it
+if gcc -fno-strict-aliasing -S -o /dev/null -xc /dev/null >/dev/null 2>&1;
+then
+ CFLAGS="-fno-strict-aliasing $CFLAGS"
+fi
+
+
+# Check system type
+case "$host_os" in
+*darwin* | *rhapsody* | *macosx*)
+     AC_DEFINE_UNQUOTED(OSX,1,[This is an OS X system])
+     CFLAGS="-no-cpp-precomp $CFLAGS"
+     LDFLAGS="-flat_namespace -undefined suppress $LDFLAGS"
+     ;;
+linux*)
+     AC_DEFINE_UNQUOTED(LINUX,1,[This is a Linux system])
+     ;;
+freebsd*)
+     AC_DEFINE_UNQUOTED(SOMEBSD,1,[This is a BSD system])
+     AC_DEFINE_UNQUOTED(FREEBSD,1,[This is a FreeBSD system])
+     CFLAGS="-D_THREAD_SAFE $CFLAGS"
+     ;;
+openbsd*)
+     AC_DEFINE_UNQUOTED(SOMEBSD,1,[This is a BSD system])
+     AC_DEFINE_UNQUOTED(OPENBSD,1,[This is an OpenBSD system])
+     ;;
+netbsd*)
+     AC_DEFINE_UNQUOTED(SOMEBSD,1,[This is a BSD system])
+     AC_DEFINE_UNQUOTED(NETBSD,1,[This is a NetBSD system])
+     ;;
+*solaris*)
+     AC_DEFINE_UNQUOTED(SOLARIS,1,[This is a Solaris system])
+     AC_DEFINE_UNQUOTED(_REENTRANT,1,[Need with solaris or errno doesnt work])
+     AC_CHECK_LIB(resolv, res_init)
+     build_target="solaris"
+     ;;
+*arm-linux*)
+     AC_DEFINE_UNQUOTED(LINUX,1,[This is a Linux system])
+     CFLAGS="-D_REENTRANT -fPIC -pipe $CFLAGS"
+     ;;
+*cygwin*)
+     AC_DEFINE_UNQUOTED(CYGWIN,1,[This is a Cygwin system])
+     AC_DEFINE_UNQUOTED(WINDOWS,1,[This is a Windows system])
+     AC_CHECK_LIB(intl, gettext)
+     LDFLAGS="$LDFLAGS -no-undefined"
+     CFLAGS="-mms-bitfields $CFLAGS"
+     build_target="cygwin"
+     ;;
+*mingw*)
+     AC_DEFINE_UNQUOTED(MINGW,1,[This is a MinGW system])
+     AC_DEFINE_UNQUOTED(WINDOWS,1,[This is a Windows system])
+     AC_DEFINE_UNQUOTED(_WIN32,1,[This is a Windows system])
+     AC_CHECK_LIB(intl, gettext)
+     LDFLAGS="$LDFLAGS -no-undefined -Wl,--export-all-symbols -lws2_32 -lplibc"
+     CFLAGS="-mms-bitfields $CFLAGS"
+     build_target="mingw"
+     ;;
+*)
+     AC_MSG_RESULT(Unrecognised OS $host_os)
+     AC_DEFINE_UNQUOTED(OTHEROS,1,[Some strange OS])
+;;
+esac
+
+# some other checks for standard libs
+AC_CHECK_LIB(nsl, gethostbyname)
+AC_CHECK_LIB(socket, socket)
+AC_CHECK_LIB(m, log)
+
+# Checks for standard typedefs, structures, and compiler characteristics.
+AC_C_CONST
+AC_TYPE_PID_T
+
+# check for gettext
+AM_GNU_GETTEXT_VERSION([0.14.4])
+AM_GNU_GETTEXT([external])
+
+# test for GNUnet core
+gnunet=0
+AC_MSG_CHECKING(for GNUnet core)
+AC_ARG_WITH(gnunet,
+   [  --with-gnunet=PFX       Base of GNUnet installation],
+   [AC_MSG_RESULT([$with_gnunet])
+    case $with_gnunet in
+      no)
+        ;;
+      yes)
+        AC_CHECK_HEADERS(GNUnet/gnunet_util.h,
+          AC_CHECK_LIB([gnunetutil], [initUtil],
+            gnunet=1))
+        ;;
+      *)
+        LDFLAGS="-L$with_gnunet/lib $LDFLAGS"
+        CPPFLAGS="-I$with_gnunet/include $CPPFLAGS"
+        AC_CHECK_HEADERS(GNUnet/gnunet_util.h,
+          AC_CHECK_LIB([gnunetutil], [initUtil],
+            EXT_LIB_PATH="-L$with_gnunet/lib $EXT_LIB_PATH"
+            gnunet=1))
+        ;;
+    esac
+   ],
+   [AC_MSG_RESULT([--with-gnunet not specified])
+    AC_CHECK_HEADERS(gnunet_util.h,
+     AC_CHECK_LIB([GNUnet/gnunet_util.h], [initUtil],
+      gnunet=1))])
+if test "$gnunet" != 1
+then
+ AC_MSG_ERROR([gnunet-gtk requires GNUnet])
+fi
+AC_CHECK_HEADERS([GNUnet/gnunet_ecrs_lib.h GNUnet/gnunet_fsui_lib.h 
GNUnet/gnunet_stats_lib.h GNUnet/gnunet_getoption_lib.h],,
+                 AC_MSG_ERROR([compiling gnunet-gtk requires GNUnet core 
headers]))
+AC_CHECK_LIB(gnunetecrs,ECRS_createMetaData,,
+             AC_MSG_ERROR([gnunet-gtk requires ECRS]))
+AC_CHECK_LIB(gnunetfsui,FSUI_start,,
+             AC_MSG_ERROR([gnunet-gtk requires FSUI]))
+AC_CHECK_LIB(gnunetgetoption_api,getConfigurationOptionValue,,
+             AC_MSG_ERROR([gnunet-gtk requires getoption]))
+AC_CHECK_LIB(gnunetstats_api,requestStatistics,,
+             AC_MSG_ERROR([gnunet-gtk requires stats]))
+
+
+
+# Set PACKAGE_LOCALE_DIR in config.h.
 if test "x${prefix}" = "xNONE"; then
-  AC_DEFINE_UNQUOTED(PACKAGE_LOCALE_DIR, 
"${ac_default_prefix}/${DATADIRNAME}/locale")
+  AC_DEFINE_UNQUOTED(PACKAGE_LOCALE_DIR, 
"${ac_default_prefix}/${DATADIRNAME}/locale", [locale dir])
 else
-  AC_DEFINE_UNQUOTED(PACKAGE_LOCALE_DIR, "${prefix}/${DATADIRNAME}/locale")
+  AC_DEFINE_UNQUOTED(PACKAGE_LOCALE_DIR, "${prefix}/${DATADIRNAME}/locale", 
[locale dir])
 fi
 
-dnl Set PACKAGE_DATA_DIR in config.h.
+# Set PACKAGE_DATA_DIR in config.h.
 if test "x${datadir}" = 'x${prefix}/share'; then
   if test "x${prefix}" = "xNONE"; then
-    AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, 
"${ac_default_prefix}/share/${PACKAGE}")
+    AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, 
"${ac_default_prefix}/share/${PACKAGE}", [data dir])
   else
-    AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/share/${PACKAGE}")
+    AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/share/${PACKAGE}", [data 
dir])
   fi
 else
-  AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${datadir}/${PACKAGE}")
+  AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${datadir}/${PACKAGE}", [package data 
dir])
 fi
 
-dnl Set PACKAGE_SOURCE_DIR in config.h.
+# Set PACKAGE_SOURCE_DIR in config.h.
 packagesrcdir=`cd $srcdir && pwd`
-AC_DEFINE_UNQUOTED(PACKAGE_SOURCE_DIR, "${packagesrcdir}")
+AC_DEFINE_UNQUOTED(PACKAGE_SOURCE_DIR, "${packagesrcdir}", [source dir])
 
-dnl Use -Wall if we have gcc.
-changequote(,)dnl
-if test "x$GCC" = "xyes"; then
-  case " $CFLAGS " in
-  *[\ \        ]-Wall[\ \      ]*) ;;
-  *) CFLAGS="$CFLAGS -Wall" ;;
-  esac
-fi
-changequote([,])dnl
 
 AC_OUTPUT([
 Makefile
 src/Makefile
-intl/Makefile
 po/Makefile.in
 po/Makefile
 ])

Modified: gnunet-gtk/gnunet-gtk.glade
===================================================================
--- gnunet-gtk/gnunet-gtk.glade 2005-05-24 11:18:12 UTC (rev 806)
+++ gnunet-gtk/gnunet-gtk.glade 2005-05-24 11:20:25 UTC (rev 807)
@@ -11,6 +11,7 @@
   <property name="modal">False</property>
   <property name="resizable">True</property>
   <property name="destroy_with_parent">False</property>
+  <property name="icon">gnunet_logo.png</property>
   <property name="decorated">True</property>
   <property name="skip_taskbar_hint">False</property>
   <property name="skip_pager_hint">False</property>
@@ -25,35 +26,33 @@
       <property name="spacing">0</property>
 
       <child>
-       <widget class="GtkMenuBar" id="menubar1">
+       <widget class="GtkMenuBar" id="main_app_menubar">
          <property name="visible">True</property>
 
          <child>
-           <widget class="GtkMenuItem" id="quit1">
+           <widget class="GtkImageMenuItem" id="quit1">
              <property name="visible">True</property>
-             <property name="label" translatable="yes">_Quit</property>
-             <property name="use_underline">True</property>
+             <property name="label">gtk-quit</property>
+             <property name="use_stock">True</property>
              <signal name="activate" handler="gtk_main_quit"/>
            </widget>
          </child>
 
          <child>
-           <widget class="GtkMenuItem" id="help1">
+           <widget class="GtkImageMenuItem" id="help1">
              <property name="visible">True</property>
-             <property name="label" translatable="yes">_Help</property>
-             <property name="use_underline">True</property>
+             <property name="label">gtk-help</property>
+             <property name="use_stock">True</property>
 
              <child>
                <widget class="GtkMenu" id="help1_menu">
-                 <property name="visible">True</property>
 
                  <child>
-                   <widget class="GtkMenuItem" id="about">
+                   <widget class="GtkImageMenuItem" id="about">
                      <property name="visible">True</property>
-                     <property name="label" 
translatable="yes">_About</property>
-                     <property name="use_underline">True</property>
+                     <property name="label">gtk-about</property>
+                     <property name="use_stock">True</property>
                      <signal name="activate" handler="on_about_activate"/>
-                     <accelerator key="F1" modifiers="0" signal="activate"/>
                    </widget>
                  </child>
                </widget>
@@ -79,8 +78,51 @@
          <property name="enable_popup">False</property>
 
          <child>
-           <widget class="GtkScrolledWindow" id="scrolledwindow1">
+           <widget class="GtkLabel" id="splashScreen">
              <property name="visible">True</property>
+             <property name="label" translatable="yes">Welcome to GNUnet
+</property>
+             <property name="use_underline">False</property>
+             <property name="use_markup">True</property>
+             <property name="justify">GTK_JUSTIFY_LEFT</property>
+             <property name="wrap">True</property>
+             <property name="selectable">False</property>
+             <property name="xalign">0.5</property>
+             <property name="yalign">0.5</property>
+             <property name="xpad">0</property>
+             <property name="ypad">0</property>
+           </widget>
+           <packing>
+             <property name="tab_expand">False</property>
+             <property name="tab_fill">True</property>
+           </packing>
+         </child>
+
+         <child>
+           <widget class="GtkLabel" id="welcomelabel">
+             <property name="visible">True</property>
+             <property name="label" translatable="yes">_Welcome</property>
+             <property name="use_underline">True</property>
+             <property name="use_markup">False</property>
+             <property name="justify">GTK_JUSTIFY_LEFT</property>
+             <property name="wrap">False</property>
+             <property name="selectable">False</property>
+             <property name="xalign">0.5</property>
+             <property name="yalign">0.5</property>
+             <property name="xpad">0</property>
+             <property name="ypad">0</property>
+             <accessibility>
+               <atkproperty name="AtkObject::accessible_name" 
translatable="yes">Splash Screen</atkproperty>
+             </accessibility>
+           </widget>
+           <packing>
+             <property name="type">tab</property>
+           </packing>
+         </child>
+
+         <child>
+           <widget class="GtkScrolledWindow" id="fs_scrolledwindow">
+             <property name="visible">True</property>
              <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
              <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
              <property name="shadow_type">GTK_SHADOW_NONE</property>
@@ -124,11 +166,12 @@
                                      <property name="spacing">0</property>
 
                                      <child>
-                                       <widget class="GtkButton" id="button10">
+                                       <widget class="GtkButton" 
id="startGnunetdButton">
                                          <property 
name="visible">True</property>
                                          <property 
name="can_focus">True</property>
                                          <property 
name="relief">GTK_RELIEF_NORMAL</property>
                                          <property 
name="focus_on_click">True</property>
+                                         <signal name="clicked" 
handler="on_startGnunetdButton_clicked" last_modification_time="Mon, 23 May 
2005 19:05:11 GMT"/>
 
                                          <child>
                                            <widget class="GtkAlignment" 
id="alignment1">
@@ -204,6 +247,7 @@
                                          <property 
name="can_focus">True</property>
                                          <property 
name="relief">GTK_RELIEF_NORMAL</property>
                                          <property 
name="focus_on_click">True</property>
+                                         <signal name="clicked" 
handler="on_stopDaemon_clicked" last_modification_time="Mon, 23 May 2005 
19:05:25 GMT"/>
 
                                          <child>
                                            <widget class="GtkAlignment" 
id="alignment2">
@@ -296,7 +340,7 @@
                                  </child>
 
                                  <child>
-                                   <widget class="GtkLabel" id="label1">
+                                   <widget class="GtkLabel" 
id="gnunetdControlLabel">
                                      <property name="visible">True</property>
                                      <property name="label" 
translatable="yes">gnunetd control</property>
                                      <property 
name="use_underline">False</property>
@@ -440,7 +484,7 @@
          </child>
 
          <child>
-           <widget class="GtkLabel" id="label1">
+           <widget class="GtkLabel" id="generalLabel">
              <property name="visible">True</property>
              <property name="label" translatable="yes">_General</property>
              <property name="use_underline">True</property>
@@ -469,7 +513,7 @@
              <property name="enable_popup">False</property>
 
              <child>
-               <widget class="GtkVBox" id="vbox5">
+               <widget class="GtkVBox" id="fsstatusvbox">
                  <property name="visible">True</property>
                  <property name="homogeneous">False</property>
                  <property name="spacing">0</property>
@@ -662,14 +706,13 @@
              </child>
 
              <child>
-               <widget class="GtkVBox" id="vbox7">
+               <widget class="GtkVBox" id="fsdownloadvbox">
                  <property name="visible">True</property>
                  <property name="homogeneous">False</property>
                  <property name="spacing">0</property>
 
                  <child>
                    <widget class="GtkNotebook" id="notebook6">
-                     <property name="visible">True</property>
                      <property name="can_focus">True</property>
                      <property name="show_tabs">True</property>
                      <property name="show_border">True</property>
@@ -679,7 +722,6 @@
 
                      <child>
                        <widget class="GtkLabel" id="label61">
-                         <property name="visible">True</property>
                          <property name="label" 
translatable="yes">label61</property>
                          <property name="use_underline">False</property>
                          <property name="use_markup">False</property>
@@ -699,7 +741,6 @@
 
                      <child>
                        <widget class="GtkLabel" id="label36">
-                         <property name="visible">True</property>
                          <property name="label" 
translatable="yes">label36</property>
                          <property name="use_underline">False</property>
                          <property name="use_markup">False</property>
@@ -724,19 +765,22 @@
                  </child>
 
                  <child>
-                   <widget class="GtkHBox" id="hbox4">
+                   <widget class="GtkHBox" id="fssearchhbox">
                      <property name="visible">True</property>
                      <property name="homogeneous">False</property>
                      <property name="spacing">0</property>
 
                      <child>
-                       <widget class="GtkCombo" id="combo2">
+                       <widget class="GtkCombo" id="fsSearchStringInputLine">
                          <property name="visible">True</property>
                          <property name="value_in_list">False</property>
                          <property name="allow_empty">True</property>
                          <property name="case_sensitive">False</property>
                          <property name="enable_arrow_keys">True</property>
                          <property name="enable_arrows_always">False</property>
+                         <accessibility>
+                           <atkproperty 
name="AtkObject::accessible_description" translatable="yes">Enter the keywords 
to search for in this line.</atkproperty>
+                         </accessibility>
 
                          <child internal-child="entry">
                            <widget class="GtkEntry" id="combo-entry2">
@@ -749,6 +793,7 @@
                              <property name="has_frame">True</property>
                              <property name="invisible_char">*</property>
                              <property 
name="activates_default">False</property>
+                             <accelerator key="Return" modifiers="0" 
signal="activate"/>
                            </widget>
                          </child>
 
@@ -792,10 +837,70 @@
                        <widget class="GtkButton" id="fssearchbutton">
                          <property name="visible">True</property>
                          <property name="can_focus">True</property>
-                         <property name="label" 
translatable="yes">_search</property>
-                         <property name="use_underline">True</property>
                          <property name="relief">GTK_RELIEF_NORMAL</property>
                          <property name="focus_on_click">True</property>
+                         <signal name="clicked" 
handler="on_fssearchbutton_clicked" object="fssearchhbox" 
last_modification_time="Mon, 23 May 2005 19:06:23 GMT"/>
+                         <accelerator key="Return" modifiers="0" 
signal="activate"/>
+
+                         <child>
+                           <widget class="GtkAlignment" id="alignment8">
+                             <property name="visible">True</property>
+                             <property name="xalign">0.5</property>
+                             <property name="yalign">0.5</property>
+                             <property name="xscale">0</property>
+                             <property name="yscale">0</property>
+                             <property name="top_padding">0</property>
+                             <property name="bottom_padding">0</property>
+                             <property name="left_padding">0</property>
+                             <property name="right_padding">0</property>
+
+                             <child>
+                               <widget class="GtkHBox" id="hbox21">
+                                 <property name="visible">True</property>
+                                 <property name="homogeneous">False</property>
+                                 <property name="spacing">2</property>
+
+                                 <child>
+                                   <widget class="GtkImage" id="image8">
+                                     <property name="visible">True</property>
+                                     <property name="stock">gtk-find</property>
+                                     <property name="icon_size">4</property>
+                                     <property name="xalign">0.5</property>
+                                     <property name="yalign">0.5</property>
+                                     <property name="xpad">0</property>
+                                     <property name="ypad">0</property>
+                                   </widget>
+                                   <packing>
+                                     <property name="padding">0</property>
+                                     <property name="expand">False</property>
+                                     <property name="fill">False</property>
+                                   </packing>
+                                 </child>
+
+                                 <child>
+                                   <widget class="GtkLabel" id="label71">
+                                     <property name="visible">True</property>
+                                     <property name="label" 
translatable="yes">_Search</property>
+                                     <property 
name="use_underline">True</property>
+                                     <property 
name="use_markup">False</property>
+                                     <property 
name="justify">GTK_JUSTIFY_LEFT</property>
+                                     <property name="wrap">False</property>
+                                     <property 
name="selectable">False</property>
+                                     <property name="xalign">0.5</property>
+                                     <property name="yalign">0.5</property>
+                                     <property name="xpad">0</property>
+                                     <property name="ypad">0</property>
+                                   </widget>
+                                   <packing>
+                                     <property name="padding">0</property>
+                                     <property name="expand">False</property>
+                                     <property name="fill">False</property>
+                                   </packing>
+                                 </child>
+                               </widget>
+                             </child>
+                           </widget>
+                         </child>
                        </widget>
                        <packing>
                          <property name="padding">0</property>
@@ -885,7 +990,7 @@
              </child>
 
              <child>
-               <widget class="GtkVBox" id="vbox9">
+               <widget class="GtkVBox" id="fsinsertvbox">
                  <property name="visible">True</property>
                  <property name="homogeneous">False</property>
                  <property name="spacing">0</property>
@@ -897,6 +1002,28 @@
                      <property name="spacing">0</property>
 
                      <child>
+                       <widget class="GtkLabel" id="methodLabel">
+                         <property name="visible">True</property>
+                         <property name="label" 
translatable="yes">_Method:</property>
+                         <property name="use_underline">True</property>
+                         <property name="use_markup">False</property>
+                         <property name="justify">GTK_JUSTIFY_LEFT</property>
+                         <property name="wrap">False</property>
+                         <property name="selectable">False</property>
+                         <property name="xalign">0.5</property>
+                         <property name="yalign">0.5</property>
+                         <property name="xpad">5</property>
+                         <property name="ypad">0</property>
+                         <property 
name="mnemonic_widget">indexbutton</property>
+                       </widget>
+                       <packing>
+                         <property name="padding">0</property>
+                         <property name="expand">False</property>
+                         <property name="fill">False</property>
+                       </packing>
+                     </child>
+
+                     <child>
                        <widget class="GtkRadioButton" id="indexbutton">
                          <property name="visible">True</property>
                          <property name="can_focus">True</property>
@@ -949,6 +1076,28 @@
                      <property name="spacing">0</property>
 
                      <child>
+                       <widget class="GtkLabel" id="scopeLabel">
+                         <property name="visible">True</property>
+                         <property name="label" 
translatable="yes">_Scope:</property>
+                         <property name="use_underline">True</property>
+                         <property name="use_markup">False</property>
+                         <property name="justify">GTK_JUSTIFY_LEFT</property>
+                         <property name="wrap">False</property>
+                         <property name="selectable">False</property>
+                         <property name="xalign">0.5</property>
+                         <property name="yalign">0.5</property>
+                         <property name="xpad">5</property>
+                         <property name="ypad">0</property>
+                         <property 
name="mnemonic_widget">radiobutton2</property>
+                       </widget>
+                       <packing>
+                         <property name="padding">0</property>
+                         <property name="expand">False</property>
+                         <property name="fill">False</property>
+                       </packing>
+                     </child>
+
+                     <child>
                        <widget class="GtkRadioButton" id="radiobutton2">
                          <property name="visible">True</property>
                          <property name="can_focus">True</property>
@@ -1003,7 +1152,7 @@
                      <child>
                        <widget class="GtkLabel" id="label54">
                          <property name="visible">True</property>
-                         <property name="label" 
translatable="yes">_Filename</property>
+                         <property name="label" 
translatable="yes">_Filename:</property>
                          <property name="use_underline">True</property>
                          <property name="use_markup">False</property>
                          <property name="justify">GTK_JUSTIFY_CENTER</property>
@@ -1011,7 +1160,7 @@
                          <property name="selectable">False</property>
                          <property name="xalign">0.5</property>
                          <property name="yalign">0.5</property>
-                         <property name="xpad">0</property>
+                         <property name="xpad">5</property>
                          <property name="ypad">0</property>
                          <property 
name="mnemonic_widget">combo-entry1</property>
                        </widget>
@@ -1023,7 +1172,7 @@
                      </child>
 
                      <child>
-                       <widget class="GtkCombo" id="combo1">
+                       <widget class="GtkCombo" id="fsinsertfilenamecombo">
                          <property name="visible">True</property>
                          <property name="value_in_list">False</property>
                          <property name="allow_empty">True</property>
@@ -1082,13 +1231,72 @@
                      </child>
 
                      <child>
-                       <widget class="GtkButton" id="button9">
+                       <widget class="GtkButton" 
id="mainFileSharingInsertBrowseButton">
                          <property name="visible">True</property>
                          <property name="can_focus">True</property>
-                         <property name="label" 
translatable="yes">Browse</property>
-                         <property name="use_underline">True</property>
                          <property name="relief">GTK_RELIEF_NORMAL</property>
                          <property name="focus_on_click">True</property>
+                         <signal name="activate" 
handler="on_mainFileSharingInsertBrowseButton_activate" 
object="fsinsertfilenamecombo" last_modification_time="Mon, 23 May 2005 
17:09:36 GMT"/>
+
+                         <child>
+                           <widget class="GtkAlignment" id="alignment7">
+                             <property name="visible">True</property>
+                             <property name="xalign">0.5</property>
+                             <property name="yalign">0.5</property>
+                             <property name="xscale">0</property>
+                             <property name="yscale">0</property>
+                             <property name="top_padding">0</property>
+                             <property name="bottom_padding">0</property>
+                             <property name="left_padding">0</property>
+                             <property name="right_padding">0</property>
+
+                             <child>
+                               <widget class="GtkHBox" id="hbox20">
+                                 <property name="visible">True</property>
+                                 <property name="homogeneous">False</property>
+                                 <property name="spacing">2</property>
+
+                                 <child>
+                                   <widget class="GtkImage" id="image7">
+                                     <property name="visible">True</property>
+                                     <property name="stock">gtk-home</property>
+                                     <property name="icon_size">4</property>
+                                     <property name="xalign">0.5</property>
+                                     <property name="yalign">0.5</property>
+                                     <property name="xpad">0</property>
+                                     <property name="ypad">0</property>
+                                   </widget>
+                                   <packing>
+                                     <property name="padding">0</property>
+                                     <property name="expand">False</property>
+                                     <property name="fill">False</property>
+                                   </packing>
+                                 </child>
+
+                                 <child>
+                                   <widget class="GtkLabel" id="label70">
+                                     <property name="visible">True</property>
+                                     <property name="label" 
translatable="yes">_Browse</property>
+                                     <property 
name="use_underline">True</property>
+                                     <property 
name="use_markup">False</property>
+                                     <property 
name="justify">GTK_JUSTIFY_LEFT</property>
+                                     <property name="wrap">False</property>
+                                     <property 
name="selectable">False</property>
+                                     <property name="xalign">0.5</property>
+                                     <property name="yalign">0.5</property>
+                                     <property name="xpad">0</property>
+                                     <property name="ypad">0</property>
+                                   </widget>
+                                   <packing>
+                                     <property name="padding">0</property>
+                                     <property name="expand">False</property>
+                                     <property name="fill">False</property>
+                                   </packing>
+                                 </child>
+                               </widget>
+                             </child>
+                           </widget>
+                         </child>
                        </widget>
                        <packing>
                          <property name="padding">0</property>
@@ -1103,6 +1311,81 @@
                      <property name="fill">False</property>
                    </packing>
                  </child>
+
+                 <child>
+                   <widget class="GtkButton" id="fsinsertuploadbutton">
+                     <property name="visible">True</property>
+                     <property name="can_focus">True</property>
+                     <property name="relief">GTK_RELIEF_NORMAL</property>
+                     <property name="focus_on_click">True</property>
+                     <signal name="clicked" 
handler="on_fsinsertuploadbutton_clicked" object="fsinsertvbox" 
last_modification_time="Mon, 23 May 2005 19:12:55 GMT"/>
+
+                     <child>
+                       <widget class="GtkAlignment" id="alignment9">
+                         <property name="visible">True</property>
+                         <property name="xalign">0.5</property>
+                         <property name="yalign">0.5</property>
+                         <property name="xscale">0</property>
+                         <property name="yscale">0</property>
+                         <property name="top_padding">0</property>
+                         <property name="bottom_padding">0</property>
+                         <property name="left_padding">0</property>
+                         <property name="right_padding">0</property>
+
+                         <child>
+                           <widget class="GtkHBox" id="hbox22">
+                             <property name="visible">True</property>
+                             <property name="homogeneous">False</property>
+                             <property name="spacing">2</property>
+
+                             <child>
+                               <widget class="GtkImage" id="image9">
+                                 <property name="visible">True</property>
+                                 <property name="stock">gtk-go-up</property>
+                                 <property name="icon_size">4</property>
+                                 <property name="xalign">0.5</property>
+                                 <property name="yalign">0.5</property>
+                                 <property name="xpad">0</property>
+                                 <property name="ypad">0</property>
+                               </widget>
+                               <packing>
+                                 <property name="padding">0</property>
+                                 <property name="expand">False</property>
+                                 <property name="fill">False</property>
+                               </packing>
+                             </child>
+
+                             <child>
+                               <widget class="GtkLabel" id="label74">
+                                 <property name="visible">True</property>
+                                 <property name="label" 
translatable="yes">_Upload</property>
+                                 <property name="use_underline">True</property>
+                                 <property name="use_markup">False</property>
+                                 <property 
name="justify">GTK_JUSTIFY_LEFT</property>
+                                 <property name="wrap">False</property>
+                                 <property name="selectable">False</property>
+                                 <property name="xalign">0.5</property>
+                                 <property name="yalign">0.5</property>
+                                 <property name="xpad">0</property>
+                                 <property name="ypad">0</property>
+                               </widget>
+                               <packing>
+                                 <property name="padding">0</property>
+                                 <property name="expand">False</property>
+                                 <property name="fill">False</property>
+                               </packing>
+                             </child>
+                           </widget>
+                         </child>
+                       </widget>
+                     </child>
+                   </widget>
+                   <packing>
+                     <property name="padding">0</property>
+                     <property name="expand">False</property>
+                     <property name="fill">False</property>
+                   </packing>
+                 </child>
                </widget>
                <packing>
                  <property name="tab_expand">False</property>
@@ -1130,7 +1413,7 @@
              </child>
 
              <child>
-               <widget class="GtkVBox" id="vbox6">
+               <widget class="GtkVBox" id="fsadvancedvbox">
                  <property name="visible">True</property>
                  <property name="homogeneous">False</property>
                  <property name="spacing">0</property>
@@ -1154,7 +1437,7 @@
                                  <property name="visible">True</property>
                                  <property name="label" 
translatable="yes">_Namespace</property>
                                  <property name="use_underline">True</property>
-                                 <signal name="activate" 
handler="on_create_namespace_activate"/>
+                                 <signal name="activate_item" 
handler="on_create_namespace_activate" last_modification_time="Mon, 23 May 2005 
19:13:47 GMT"/>
                                </widget>
                              </child>
 
@@ -1163,7 +1446,7 @@
                                  <property name="visible">True</property>
                                  <property name="label" 
translatable="yes">_Directory</property>
                                  <property name="use_underline">True</property>
-                                 <signal name="activate" 
handler="on_create_directory_activate"/>
+                                 <signal name="activate_item" 
handler="on_create_directory_activate" last_modification_time="Mon, 23 May 2005 
19:13:40 GMT"/>
                                </widget>
                              </child>
 
@@ -1172,7 +1455,7 @@
                                  <property name="visible">True</property>
                                  <property name="label" 
translatable="yes">_Collection</property>
                                  <property name="use_underline">True</property>
-                                 <signal name="activate" 
handler="on_create_collection_activate"/>
+                                 <signal name="activate_item" 
handler="on_create_collection_activate" last_modification_time="Mon, 23 May 
2005 19:13:32 GMT"/>
                                </widget>
                              </child>
 
@@ -1181,7 +1464,7 @@
                                  <property name="visible">True</property>
                                  <property name="label" 
translatable="yes">_Advertisement</property>
                                  <property name="use_underline">True</property>
-                                 <signal name="activate" 
handler="on_create_advertisement_activate"/>
+                                 <signal name="activate_item" 
handler="on_create_advertisement_activate" last_modification_time="Mon, 23 May 
2005 19:13:53 GMT"/>
                                </widget>
                              </child>
                            </widget>
@@ -1205,7 +1488,7 @@
                                  <property name="tooltip" 
translatable="yes">Will prevent future insertions into the namespace (will not 
delete content in the namespace)</property>
                                  <property name="label" 
translatable="yes">_Namespace</property>
                                  <property name="use_underline">True</property>
-                                 <signal name="activate" 
handler="on_namespace2_activate"/>
+                                 <signal name="activate_item" 
handler="on_namespace2_activate" last_modification_time="Mon, 23 May 2005 
19:14:04 GMT"/>
                                </widget>
                              </child>
 
@@ -1215,7 +1498,7 @@
                                  <property name="tooltip" 
translatable="yes">end collection (will not delete content already in the 
collection)</property>
                                  <property name="label" 
translatable="yes">_Collection</property>
                                  <property name="use_underline">True</property>
-                                 <signal name="activate" 
handler="on_collection_delete_activate"/>
+                                 <signal name="activate_item" 
handler="on_collection_delete_activate" last_modification_time="Mon, 23 May 
2005 19:14:11 GMT"/>
                                </widget>
                              </child>
                            </widget>
@@ -1232,7 +1515,6 @@
 
                  <child>
                    <widget class="GtkNotebook" id="notebook4">
-                     <property name="visible">True</property>
                      <property name="can_focus">True</property>
                      <property name="show_tabs">True</property>
                      <property name="show_border">True</property>
@@ -1242,7 +1524,6 @@
 
                      <child>
                        <widget class="GtkLabel" id="label62">
-                         <property name="visible">True</property>
                          <property name="label" 
translatable="yes">label62</property>
                          <property name="use_underline">False</property>
                          <property name="use_markup">False</property>
@@ -1262,7 +1543,6 @@
 
                      <child>
                        <widget class="GtkLabel" id="label39">
-                         <property name="visible">True</property>
                          <property name="label" 
translatable="yes">label39</property>
                          <property name="use_underline">False</property>
                          <property name="use_markup">False</property>
@@ -1334,7 +1614,7 @@
                      <child>
                        <widget class="GtkLabel" id="label55">
                          <property name="visible">True</property>
-                         <property name="label" 
translatable="yes">Content</property>
+                         <property name="label" translatable="yes">Available 
Content</property>
                          <property name="use_underline">False</property>
                          <property name="use_markup">False</property>
                          <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -1408,8 +1688,7 @@
          </child>
 
          <child>
-           <widget class="GtkVBox" id="vbox3">
-             <property name="visible">True</property>
+           <widget class="GtkVBox" id="statisticsnotebookvbox">
              <property name="homogeneous">False</property>
              <property name="spacing">0</property>
 
@@ -1460,14 +1739,13 @@
          </child>
 
          <child>
-           <widget class="GtkVBox" id="vbox4">
+           <widget class="GtkVBox" id="chatnotbookvbox">
              <property name="visible">True</property>
              <property name="homogeneous">False</property>
              <property name="spacing">0</property>
 
              <child>
                <widget class="GtkNotebook" id="notebook3">
-                 <property name="visible">True</property>
                  <property name="can_focus">True</property>
                  <property name="show_tabs">True</property>
                  <property name="show_border">True</property>
@@ -1476,36 +1754,17 @@
                  <property name="enable_popup">False</property>
 
                  <child>
-                   <widget class="GtkScrolledWindow" id="scrolledwindow13">
-                     <property name="visible">True</property>
-                     <property name="can_focus">True</property>
-                     <property 
name="hscrollbar_policy">GTK_POLICY_ALWAYS</property>
-                     <property 
name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
-                     <property name="shadow_type">GTK_SHADOW_IN</property>
-                     <property 
name="window_placement">GTK_CORNER_TOP_LEFT</property>
-
-                     <child>
-                       <widget class="GtkViewport" id="viewport4">
-                         <property name="visible">True</property>
-                         <property name="shadow_type">GTK_SHADOW_IN</property>
-
-                         <child>
-                           <widget class="GtkLabel" id="label59">
-                             <property name="visible">True</property>
-                             <property name="label" 
translatable="yes">label59</property>
-                             <property name="use_underline">False</property>
-                             <property name="use_markup">False</property>
-                             <property 
name="justify">GTK_JUSTIFY_LEFT</property>
-                             <property name="wrap">False</property>
-                             <property name="selectable">False</property>
-                             <property name="xalign">0.5</property>
-                             <property name="yalign">0.5</property>
-                             <property name="xpad">0</property>
-                             <property name="ypad">0</property>
-                           </widget>
-                         </child>
-                       </widget>
-                     </child>
+                   <widget class="GtkLabel" id="label72">
+                     <property name="label" 
translatable="yes">label72</property>
+                     <property name="use_underline">False</property>
+                     <property name="use_markup">False</property>
+                     <property name="justify">GTK_JUSTIFY_LEFT</property>
+                     <property name="wrap">False</property>
+                     <property name="selectable">False</property>
+                     <property name="xalign">0.5</property>
+                     <property name="yalign">0.5</property>
+                     <property name="xpad">0</property>
+                     <property name="ypad">0</property>
                    </widget>
                    <packing>
                      <property name="tab_expand">False</property>
@@ -1515,7 +1774,6 @@
 
                  <child>
                    <widget class="GtkLabel" id="label38">
-                     <property name="visible">True</property>
                      <property name="label" 
translatable="yes">label38</property>
                      <property name="use_underline">False</property>
                      <property name="use_markup">False</property>
@@ -1549,7 +1807,7 @@
                  <property name="enable_arrows_always">False</property>
 
                  <child internal-child="entry">
-                   <widget class="GtkEntry" id="combo-entry3">
+                   <widget class="GtkEntry" id="chatMainEntryLine">
                      <property name="visible">True</property>
                      <property name="can_focus">True</property>
                      <property name="editable">True</property>
@@ -1559,6 +1817,9 @@
                      <property name="has_frame">True</property>
                      <property name="invisible_char">*</property>
                      <property name="activates_default">False</property>
+                     <signal name="activate" 
handler="chatMainEntryLine_activate" last_modification_time="Mon, 23 May 2005 
17:28:12 GMT"/>
+                     <signal name="editing_done" 
handler="on_chatMainEntryLine_editing_done" last_modification_time="Mon, 23 May 
2005 17:28:16 GMT"/>
+                     <accelerator key="Return" modifiers="0" 
signal="activate"/>
                    </widget>
                  </child>
 
@@ -1627,7 +1888,7 @@
          </child>
 
          <child>
-           <widget class="GtkLabel" id="label6">
+           <widget class="GtkLabel" id="chatNotebookLabel">
              <property name="visible">True</property>
              <property name="label" translatable="yes">_Chat</property>
              <property name="use_underline">True</property>
@@ -1655,6 +1916,7 @@
       <child>
        <widget class="GtkStatusbar" id="statusbar">
          <property name="visible">True</property>
+         <property name="sensitive">False</property>
          <property name="has_resize_grip">True</property>
        </widget>
        <packing>
@@ -1667,20 +1929,26 @@
   </child>
 </widget>
 
-<widget class="GtkDialog" id="metadatadialog">
+<widget class="GtkDialog" id="metaDataDialog">
   <property name="visible">True</property>
-  <property name="title" translatable="yes">File Information</property>
+  <property name="title" translatable="yes">Edit File Information</property>
   <property name="type">GTK_WINDOW_TOPLEVEL</property>
   <property name="window_position">GTK_WIN_POS_NONE</property>
-  <property name="modal">False</property>
+  <property name="modal">True</property>
   <property name="resizable">True</property>
   <property name="destroy_with_parent">False</property>
+  <property name="icon">info.png</property>
   <property name="decorated">True</property>
   <property name="skip_taskbar_hint">False</property>
   <property name="skip_pager_hint">False</property>
   <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
   <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
   <property name="has_separator">True</property>
+  <accessibility>
+    <atkproperty name="AtkObject::accessible_name" translatable="yes">Edit 
File Information</atkproperty>
+    <atkproperty name="AtkObject::accessible_description" 
translatable="yes">This dialog is used to edit information about shared 
files.</atkproperty>
+  </accessibility>
+  <signal name="close" handler="on_metaDataDialog_close" 
last_modification_time="Mon, 23 May 2005 16:20:23 GMT"/>
 
   <child internal-child="vbox">
     <widget class="GtkVBox" id="dialog-vbox1">
@@ -1691,19 +1959,62 @@
       <child internal-child="action_area">
        <widget class="GtkHButtonBox" id="dialog-action_area1">
          <property name="visible">True</property>
-         <property name="layout_style">GTK_BUTTONBOX_END</property>
+         <property name="layout_style">GTK_BUTTONBOX_SPREAD</property>
 
          <child>
-           <widget class="GtkButton" id="button7">
+           <widget class="GtkButton" id="metaDataDialogDeleteButton">
              <property name="visible">True</property>
+             <property name="sensitive">False</property>
+             <property name="tooltip" translatable="yes">Use this button to 
delete meta-data or keywords.</property>
+             <property name="can_default">True</property>
              <property name="can_focus">True</property>
-             <property name="label" translatable="yes">_Done</property>
-             <property name="use_underline">True</property>
+             <property name="label">gtk-delete</property>
+             <property name="use_stock">True</property>
              <property name="relief">GTK_RELIEF_NORMAL</property>
              <property name="focus_on_click">True</property>
              <property name="response_id">0</property>
+             <accessibility>
+               <atkproperty name="AtkObject::accessible_name" 
translatable="yes">Delete button</atkproperty>
+             </accessibility>
+             <signal name="activate" 
handler="on_metaDataDialogDeleteButton_activate" last_modification_time="Mon, 
23 May 2005 18:49:51 GMT"/>
+             <accelerator key="Delete" modifiers="0" signal="activate"/>
            </widget>
          </child>
+
+         <child>
+           <widget class="GtkButton" id="metaDataDialogCancelButton">
+             <property name="visible">True</property>
+             <property name="can_default">True</property>
+             <property name="can_focus">True</property>
+             <property name="label">gtk-cancel</property>
+             <property name="use_stock">True</property>
+             <property name="relief">GTK_RELIEF_NORMAL</property>
+             <property name="focus_on_click">True</property>
+             <property name="response_id">-6</property>
+             <accessibility>
+               <atkproperty name="AtkObject::accessible_name" 
translatable="yes">metaDataDialogCancelButton</atkproperty>
+               <atkproperty name="AtkObject::accessible_description" 
translatable="yes">Abort the upload operation.</atkproperty>
+             </accessibility>
+             <signal name="clicked" handler="gtk_widget_destroy" 
object="metaDataDialog" last_modification_time="Mon, 23 May 2005 18:51:21 GMT"/>
+             <signal name="activate" handler="gtk_widget_destroy" 
object="metaDataDialog" last_modification_time="Mon, 23 May 2005 18:53:50 GMT"/>
+             <accelerator key="Escape" modifiers="0" signal="activate"/>
+           </widget>
+         </child>
+
+         <child>
+           <widget class="GtkButton" id="metaDataDialogApplyButton">
+             <property name="visible">True</property>
+             <property name="can_default">True</property>
+             <property name="can_focus">True</property>
+             <property name="label">gtk-apply</property>
+             <property name="use_stock">True</property>
+             <property name="relief">GTK_RELIEF_NORMAL</property>
+             <property name="focus_on_click">True</property>
+             <property name="response_id">-10</property>
+             <signal name="clicked" 
handler="on_metaDataDialogApplyButton_clicked" object="metaDataDialog" 
last_modification_time="Mon, 23 May 2005 18:54:12 GMT"/>
+             <accelerator key="A" modifiers="GDK_MOD1_MASK" signal="activate"/>
+           </widget>
+         </child>
        </widget>
        <packing>
          <property name="padding">0</property>
@@ -1714,24 +2025,46 @@
       </child>
 
       <child>
-       <widget class="GtkVBox" id="vbox8">
+       <widget class="GtkLabel" id="label51">
          <property name="visible">True</property>
+         <property name="label" translatable="yes">Please provide meta-data 
and keywords for the content.</property>
+         <property name="use_underline">False</property>
+         <property name="use_markup">False</property>
+         <property name="justify">GTK_JUSTIFY_CENTER</property>
+         <property name="wrap">False</property>
+         <property name="selectable">False</property>
+         <property name="xalign">0.5</property>
+         <property name="yalign">0.5</property>
+         <property name="xpad">9</property>
+         <property name="ypad">5</property>
+       </widget>
+       <packing>
+         <property name="padding">0</property>
+         <property name="expand">False</property>
+         <property name="fill">False</property>
+       </packing>
+      </child>
+
+      <child>
+       <widget class="GtkHBox" id="hbox6">
+         <property name="visible">True</property>
          <property name="homogeneous">False</property>
          <property name="spacing">0</property>
 
          <child>
-           <widget class="GtkLabel" id="label51">
+           <widget class="GtkLabel" id="label49">
              <property name="visible">True</property>
-             <property name="label" translatable="yes">Please provide 
meta-data and keywords for the content.</property>
-             <property name="use_underline">False</property>
+             <property name="label" translatable="yes">_Type:</property>
+             <property name="use_underline">True</property>
              <property name="use_markup">False</property>
-             <property name="justify">GTK_JUSTIFY_CENTER</property>
+             <property name="justify">GTK_JUSTIFY_LEFT</property>
              <property name="wrap">False</property>
              <property name="selectable">False</property>
              <property name="xalign">0.5</property>
              <property name="yalign">0.5</property>
-             <property name="xpad">9</property>
-             <property name="ypad">5</property>
+             <property name="xpad">5</property>
+             <property name="ypad">0</property>
+             <property name="mnemonic_widget">optionmenu2</property>
            </widget>
            <packing>
              <property name="padding">0</property>
@@ -1741,116 +2074,46 @@
          </child>
 
          <child>
-           <widget class="GtkHBox" id="hbox6">
+           <widget class="GtkOptionMenu" id="optionmenu2">
              <property name="visible">True</property>
-             <property name="homogeneous">False</property>
-             <property name="spacing">0</property>
+             <property name="can_focus">True</property>
+             <property name="history">0</property>
 
-             <child>
-               <widget class="GtkLabel" id="label49">
+             <child internal-child="menu">
+               <widget class="GtkMenu" id="convertwidget30">
                  <property name="visible">True</property>
-                 <property name="label" translatable="yes">_Type</property>
-                 <property name="use_underline">True</property>
-                 <property name="use_markup">False</property>
-                 <property name="justify">GTK_JUSTIFY_CENTER</property>
-                 <property name="wrap">False</property>
-                 <property name="selectable">False</property>
-                 <property name="xalign">0.5</property>
-                 <property name="yalign">0.5</property>
-                 <property name="xpad">0</property>
-                 <property name="ypad">0</property>
-                 <property name="mnemonic_widget">optionmenu2</property>
-               </widget>
-               <packing>
-                 <property name="padding">0</property>
-                 <property name="expand">False</property>
-                 <property name="fill">False</property>
-               </packing>
-             </child>
 
-             <child>
-               <widget class="GtkOptionMenu" id="optionmenu2">
-                 <property name="visible">True</property>
-                 <property name="can_focus">True</property>
-                 <property name="history">0</property>
-
-                 <child internal-child="menu">
-                   <widget class="GtkMenu" id="convertwidget30">
+                 <child>
+                   <widget class="GtkMenuItem" id="convertwidget31">
                      <property name="visible">True</property>
-
-                     <child>
-                       <widget class="GtkMenuItem" id="convertwidget31">
-                         <property name="visible">True</property>
-                         <property name="label" 
translatable="yes">unknown</property>
-                         <property name="use_underline">True</property>
-                       </widget>
-                     </child>
-
-                     <child>
-                       <widget class="GtkMenuItem" id="convertwidget32">
-                         <property name="visible">True</property>
-                         <property name="label" 
translatable="yes">filename</property>
-                         <property name="use_underline">True</property>
-                       </widget>
-                     </child>
-
-                     <child>
-                       <widget class="GtkMenuItem" id="convertwidget33">
-                         <property name="visible">True</property>
-                         <property name="label" 
translatable="yes">meta-data</property>
-                         <property name="use_underline">True</property>
-                       </widget>
-                     </child>
+                     <property name="label" 
translatable="yes">unknown</property>
+                     <property name="use_underline">True</property>
                    </widget>
                  </child>
                </widget>
-               <packing>
-                 <property name="padding">0</property>
-                 <property name="expand">False</property>
-                 <property name="fill">False</property>
-               </packing>
              </child>
+           </widget>
+           <packing>
+             <property name="padding">0</property>
+             <property name="expand">False</property>
+             <property name="fill">False</property>
+           </packing>
+         </child>
 
-             <child>
-               <widget class="GtkLabel" id="label50">
-                 <property name="visible">True</property>
-                 <property name="label" translatable="yes">_Value</property>
-                 <property name="use_underline">True</property>
-                 <property name="use_markup">False</property>
-                 <property name="justify">GTK_JUSTIFY_CENTER</property>
-                 <property name="wrap">False</property>
-                 <property name="selectable">False</property>
-                 <property name="xalign">0.5</property>
-                 <property name="yalign">0.5</property>
-                 <property name="xpad">0</property>
-                 <property name="ypad">0</property>
-                 <property name="mnemonic_widget">entry3</property>
-               </widget>
-               <packing>
-                 <property name="padding">0</property>
-                 <property name="expand">False</property>
-                 <property name="fill">False</property>
-               </packing>
-             </child>
-
-             <child>
-               <widget class="GtkEntry" id="entry3">
-                 <property name="visible">True</property>
-                 <property name="can_focus">True</property>
-                 <property name="editable">True</property>
-                 <property name="visibility">True</property>
-                 <property name="max_length">0</property>
-                 <property name="text" translatable="yes"></property>
-                 <property name="has_frame">True</property>
-                 <property name="invisible_char">*</property>
-                 <property name="activates_default">False</property>
-               </widget>
-               <packing>
-                 <property name="padding">0</property>
-                 <property name="expand">True</property>
-                 <property name="fill">True</property>
-               </packing>
-             </child>
+         <child>
+           <widget class="GtkLabel" id="label50">
+             <property name="visible">True</property>
+             <property name="label" translatable="yes">_Value:</property>
+             <property name="use_underline">True</property>
+             <property name="use_markup">False</property>
+             <property name="justify">GTK_JUSTIFY_CENTER</property>
+             <property name="wrap">False</property>
+             <property name="selectable">False</property>
+             <property name="xalign">0.5</property>
+             <property name="yalign">0.5</property>
+             <property name="xpad">5</property>
+             <property name="ypad">0</property>
+             <property 
name="mnemonic_widget">metaDataDialogValueEntry</property>
            </widget>
            <packing>
              <property name="padding">0</property>
@@ -1860,51 +2123,24 @@
          </child>
 
          <child>
-           <widget class="GtkFrame" id="frame12">
+           <widget class="GtkEntry" id="metaDataDialogValueEntry">
              <property name="visible">True</property>
-             <property name="label_xalign">0</property>
-             <property name="label_yalign">0.5</property>
-             <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
-
-             <child>
-               <widget class="GtkScrolledWindow" id="scrolledwindow10">
-                 <property name="visible">True</property>
-                 <property 
name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                 <property 
name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                 <property name="shadow_type">GTK_SHADOW_IN</property>
-                 <property 
name="window_placement">GTK_CORNER_TOP_LEFT</property>
-
-                 <child>
-                   <widget class="GtkTreeView" id="clist8">
-                     <property name="visible">True</property>
-                     <property name="can_focus">True</property>
-                     <property name="headers_visible">True</property>
-                     <property name="rules_hint">False</property>
-                     <property name="reorderable">False</property>
-                     <property name="enable_search">True</property>
-                   </widget>
-                 </child>
-               </widget>
-             </child>
-
-             <child>
-               <widget class="GtkLabel" id="label56">
-                 <property name="visible">True</property>
-                 <property name="label" translatable="yes">Meta-data</property>
-                 <property name="use_underline">False</property>
-                 <property name="use_markup">False</property>
-                 <property name="justify">GTK_JUSTIFY_LEFT</property>
-                 <property name="wrap">False</property>
-                 <property name="selectable">False</property>
-                 <property name="xalign">0.5</property>
-                 <property name="yalign">0.5</property>
-                 <property name="xpad">0</property>
-                 <property name="ypad">0</property>
-               </widget>
-               <packing>
-                 <property name="type">label_item</property>
-               </packing>
-             </child>
+             <property name="can_focus">True</property>
+             <property name="editable">True</property>
+             <property name="visibility">True</property>
+             <property name="max_length">0</property>
+             <property name="text" translatable="yes"></property>
+             <property name="has_frame">True</property>
+             <property name="invisible_char">*</property>
+             <property name="activates_default">False</property>
+             <accessibility>
+               <atkproperty name="AtkObject::accessible_name" 
translatable="yes">Value Entry</atkproperty>
+               <atkproperty name="AtkObject::accessible_description" 
translatable="yes">Enter the value for the meta-data of the specified type here.
+Press ENTER to add the data.</atkproperty>
+             </accessibility>
+             <signal name="editing_done" 
handler="on_metaDataDialogValueEntry_editing_done" object="metaDataDialog" 
last_modification_time="Mon, 23 May 2005 17:24:04 GMT"/>
+             <signal name="activate" 
handler="on_metaDataDialogValueEntry_editing_done" object="metaDataDialog" 
last_modification_time="Mon, 23 May 2005 18:55:30 GMT"/>
+             <accelerator key="Return" modifiers="0" signal="activate"/>
            </widget>
            <packing>
              <property name="padding">0</property>
@@ -1912,56 +2148,114 @@
              <property name="fill">True</property>
            </packing>
          </child>
+       </widget>
+       <packing>
+         <property name="padding">0</property>
+         <property name="expand">False</property>
+         <property name="fill">False</property>
+       </packing>
+      </child>
 
+      <child>
+       <widget class="GtkFrame" id="frame12">
+         <property name="visible">True</property>
+         <property name="label_xalign">0</property>
+         <property name="label_yalign">0.5</property>
+         <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
+
          <child>
-           <widget class="GtkHBox" id="hbox7">
+           <widget class="GtkScrolledWindow" id="scrolledwindow10">
              <property name="visible">True</property>
-             <property name="homogeneous">False</property>
-             <property name="spacing">0</property>
+             <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+             <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+             <property name="shadow_type">GTK_SHADOW_IN</property>
+             <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
 
              <child>
-               <widget class="GtkLabel" id="label47">
+               <widget class="GtkTreeView" id="metaDataDialogMetaDataList">
                  <property name="visible">True</property>
-                 <property name="label" translatable="yes">_Keyword</property>
-                 <property name="use_underline">True</property>
-                 <property name="use_markup">False</property>
-                 <property name="justify">GTK_JUSTIFY_CENTER</property>
-                 <property name="wrap">False</property>
-                 <property name="selectable">False</property>
-                 <property name="xalign">0.5</property>
-                 <property name="yalign">0.5</property>
-                 <property name="xpad">0</property>
-                 <property name="ypad">0</property>
-                 <property name="mnemonic_widget">entry4</property>
-               </widget>
-               <packing>
-                 <property name="padding">0</property>
-                 <property name="expand">False</property>
-                 <property name="fill">False</property>
-               </packing>
-             </child>
-
-             <child>
-               <widget class="GtkEntry" id="entry4">
-                 <property name="visible">True</property>
                  <property name="can_focus">True</property>
-                 <property name="editable">True</property>
-                 <property name="visibility">True</property>
-                 <property name="max_length">0</property>
-                 <property name="text" translatable="yes"></property>
-                 <property name="has_frame">True</property>
-                 <property name="invisible_char">*</property>
-                 <property name="activates_default">False</property>
+                 <property name="headers_visible">True</property>
+                 <property name="rules_hint">True</property>
+                 <property name="reorderable">False</property>
+                 <property name="enable_search">True</property>
+                 <signal name="select_cursor_row" 
handler="on_metaDataDialogMetaDataList_select_cursor_row" 
object="metaDataDialog" last_modification_time="Mon, 23 May 2005 18:58:13 GMT"/>
                </widget>
-               <packing>
-                 <property name="padding">0</property>
-                 <property name="expand">True</property>
-                 <property name="fill">True</property>
-               </packing>
              </child>
            </widget>
+         </child>
+
+         <child>
+           <widget class="GtkLabel" id="label56">
+             <property name="visible">True</property>
+             <property name="label" translatable="yes">Meta-data</property>
+             <property name="use_underline">False</property>
+             <property name="use_markup">False</property>
+             <property name="justify">GTK_JUSTIFY_LEFT</property>
+             <property name="wrap">False</property>
+             <property name="selectable">False</property>
+             <property name="xalign">0.5</property>
+             <property name="yalign">0.5</property>
+             <property name="xpad">0</property>
+             <property name="ypad">0</property>
+           </widget>
            <packing>
+             <property name="type">label_item</property>
+           </packing>
+         </child>
+       </widget>
+       <packing>
+         <property name="padding">0</property>
+         <property name="expand">True</property>
+         <property name="fill">True</property>
+       </packing>
+      </child>
+
+      <child>
+       <widget class="GtkHBox" id="hbox7">
+         <property name="visible">True</property>
+         <property name="homogeneous">False</property>
+         <property name="spacing">0</property>
+
+         <child>
+           <widget class="GtkLabel" id="label47">
+             <property name="visible">True</property>
+             <property name="label" translatable="yes">_Keyword:</property>
+             <property name="use_underline">True</property>
+             <property name="use_markup">False</property>
+             <property name="justify">GTK_JUSTIFY_CENTER</property>
+             <property name="wrap">False</property>
+             <property name="selectable">False</property>
+             <property name="xalign">0.5</property>
+             <property name="yalign">0.5</property>
+             <property name="xpad">5</property>
+             <property name="ypad">0</property>
+             <property 
name="mnemonic_widget">fileInformationKeywordEntry</property>
+           </widget>
+           <packing>
              <property name="padding">0</property>
+             <property name="expand">False</property>
+             <property name="fill">False</property>
+           </packing>
+         </child>
+
+         <child>
+           <widget class="GtkEntry" id="fileInformationKeywordEntry">
+             <property name="visible">True</property>
+             <property name="can_focus">True</property>
+             <property name="editable">True</property>
+             <property name="visibility">True</property>
+             <property name="max_length">0</property>
+             <property name="text" translatable="yes"></property>
+             <property name="has_frame">True</property>
+             <property name="invisible_char">*</property>
+             <property name="activates_default">False</property>
+             <signal name="activate" 
handler="fileInformationKeywordEntry_activate" object="metaDataDialog" 
last_modification_time="Mon, 23 May 2005 17:23:09 GMT"/>
+             <signal name="editing_done" 
handler="fileInformationKeywordEntry_activate" object="metaDataDialog" 
last_modification_time="Mon, 23 May 2005 18:56:54 GMT"/>
+             <accelerator key="Return" modifiers="0" signal="activate"/>
+           </widget>
+           <packing>
+             <property name="padding">0</property>
              <property name="expand">True</property>
              <property name="fill">True</property>
            </packing>
@@ -1975,14 +2269,17 @@
       </child>
 
       <child>
-       <widget class="GtkFrame" id="frame13">
+       <widget class="GtkFrame" id="metaDataDialogKeywordFrame">
          <property name="visible">True</property>
          <property name="label_xalign">0</property>
          <property name="label_yalign">0.5</property>
          <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
+         <accessibility>
+           <atkproperty name="AtkObject::accessible_description" 
translatable="yes">Lists all of the keywords that will be used.</atkproperty>
+         </accessibility>
 
          <child>
-           <widget class="GtkScrolledWindow" id="scrolledwindow11">
+           <widget class="GtkScrolledWindow" 
id="metaDataDialogKeywordScrolledWindow">
              <property name="visible">True</property>
              <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
              <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
@@ -1990,13 +2287,15 @@
              <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
 
              <child>
-               <widget class="GtkTreeView" id="clist9">
+               <widget class="GtkTreeView" id="metaDataDialogKeywordList">
                  <property name="visible">True</property>
+                 <property name="tooltip" translatable="yes">Select entries 
and use Delete button in order to delete keywords.</property>
                  <property name="can_focus">True</property>
-                 <property name="headers_visible">True</property>
-                 <property name="rules_hint">False</property>
+                 <property name="headers_visible">False</property>
+                 <property name="rules_hint">True</property>
                  <property name="reorderable">False</property>
                  <property name="enable_search">True</property>
+                 <signal name="select_cursor_row" 
handler="on_metaDataDialogKeywordList_select_cursor_row" 
object="metaDataDialog" last_modification_time="Mon, 23 May 2005 18:58:34 GMT"/>
                </widget>
              </child>
            </widget>
@@ -2034,11 +2333,12 @@
 <widget class="GtkDialog" id="metaDisplayDialog">
   <property name="visible">True</property>
   <property name="title" translatable="yes">File Information</property>
-  <property name="type">GTK_WINDOW_POPUP</property>
+  <property name="type">GTK_WINDOW_TOPLEVEL</property>
   <property name="window_position">GTK_WIN_POS_NONE</property>
-  <property name="modal">False</property>
+  <property name="modal">True</property>
   <property name="resizable">True</property>
   <property name="destroy_with_parent">False</property>
+  <property name="icon">info.png</property>
   <property name="decorated">True</property>
   <property name="skip_taskbar_hint">False</property>
   <property name="skip_pager_hint">False</property>
@@ -2058,14 +2358,18 @@
          <property name="layout_style">GTK_BUTTONBOX_END</property>
 
          <child>
-           <widget class="GtkButton" id="doneButton">
+           <widget class="GtkButton" id="fileInformationDoneButton">
              <property name="visible">True</property>
              <property name="can_focus">True</property>
-             <property name="label" translatable="yes">Done</property>
-             <property name="use_underline">True</property>
+             <property name="label">gtk-ok</property>
+             <property name="use_stock">True</property>
              <property name="relief">GTK_RELIEF_NORMAL</property>
              <property name="focus_on_click">True</property>
-             <property name="response_id">0</property>
+             <property name="response_id">-5</property>
+             <signal name="clicked" handler="gtk_widget_destroy" 
object="metaDisplayDialog" last_modification_time="Mon, 23 May 2005 18:52:54 
GMT"/>
+             <signal name="activate" handler="gtk_widget_destroy" 
object="metaDisplayDialog" last_modification_time="Mon, 23 May 2005 18:49:11 
GMT"/>
+             <accelerator key="Escape" modifiers="0" signal="activate"/>
+             <accelerator key="Return" modifiers="0" signal="activate"/>
            </widget>
          </child>
        </widget>
@@ -2201,6 +2505,8 @@
                  <property name="can_focus">True</property>
                  <property name="relief">GTK_RELIEF_NORMAL</property>
                  <property name="focus_on_click">True</property>
+                 <signal name="clicked" handler="on_downloadButton_clicked" 
object="searchResults" last_modification_time="Mon, 23 May 2005 18:59:36 GMT"/>
+                 <accelerator key="Return" modifiers="GDK_CONTROL_MASK" 
signal="activate"/>
 
                  <child>
                    <widget class="GtkAlignment" id="alignment3">
@@ -2306,13 +2612,14 @@
          <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
 
          <child>
-           <widget class="GtkTreeView" id="treeview2">
+           <widget class="GtkTreeView" id="namespaceContentFrameTreeView">
              <property name="visible">True</property>
              <property name="can_focus">True</property>
              <property name="headers_visible">True</property>
              <property name="rules_hint">False</property>
              <property name="reorderable">False</property>
              <property name="enable_search">True</property>
+             <signal name="select_cursor_row" 
handler="on_namespaceContentFrameTreeView_select_cursor_row" 
object="namespaceContentFrame" last_modification_time="Mon, 23 May 2005 
19:02:36 GMT"/>
            </widget>
          </child>
        </widget>
@@ -2330,11 +2637,12 @@
          <property name="spacing">0</property>
 
          <child>
-           <widget class="GtkButton" id="button14">
+           <widget class="GtkButton" id="namespaceInsertButton">
              <property name="visible">True</property>
              <property name="can_focus">True</property>
              <property name="relief">GTK_RELIEF_NORMAL</property>
              <property name="focus_on_click">True</property>
+             <signal name="clicked" 
handler="on_namespaceInsertButton_activate" object="namespaceContentFrame" 
last_modification_time="Mon, 23 May 2005 19:00:01 GMT"/>
 
              <child>
                <widget class="GtkAlignment" id="alignment4">
@@ -2404,15 +2712,18 @@
          </child>
 
          <child>
-           <widget class="GtkButton" id="button15">
+           <widget class="GtkButton" id="namespaceUpdateButton">
              <property name="visible">True</property>
+             <property name="sensitive">False</property>
              <property name="can_focus">True</property>
              <property name="relief">GTK_RELIEF_NORMAL</property>
-             <property name="focus_on_click">True</property>
+             <property name="focus_on_click">False</property>
+             <signal name="clicked" handler="on_namespaceUpdateButton_clicked" 
object="namespaceContentFrameTreeView" last_modification_time="Mon, 23 May 2005 
19:01:59 GMT"/>
 
              <child>
                <widget class="GtkAlignment" id="alignment5">
                  <property name="visible">True</property>
+                 <property name="sensitive">False</property>
                  <property name="xalign">0.5</property>
                  <property name="yalign">0.5</property>
                  <property name="xscale">0</property>
@@ -2523,7 +2834,7 @@
              <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
 
              <child>
-               <widget class="GtkTextView" id="textview1">
+               <widget class="GtkTextView" id="chatLogViewer">
                  <property name="visible">True</property>
                  <property name="can_focus">True</property>
                  <property name="editable">True</property>
@@ -2550,113 +2861,105 @@
          </child>
 
          <child>
-           <widget class="GtkVBox" id="vbox14">
+           <widget class="GtkHBox" id="hbox18">
              <property name="visible">True</property>
              <property name="homogeneous">False</property>
              <property name="spacing">0</property>
 
              <child>
-               <widget class="GtkHBox" id="hbox18">
+               <widget class="GtkComboBoxEntry" id="chatLineTextEntry">
                  <property name="visible">True</property>
-                 <property name="homogeneous">False</property>
-                 <property name="spacing">0</property>
+                 <property name="items" translatable="yes">/join 
#gnunet</property>
+                 <signal name="editing_done" 
handler="on_chatLineTextEntry_editing_done" last_modification_time="Mon, 23 May 
2005 17:18:48 GMT"/>
+               </widget>
+               <packing>
+                 <property name="padding">0</property>
+                 <property name="expand">True</property>
+                 <property name="fill">True</property>
+               </packing>
+             </child>
 
-                 <child>
-                   <widget class="GtkComboBoxEntry" id="comboboxentry1">
-                     <property name="visible">True</property>
-                   </widget>
-                   <packing>
-                     <property name="padding">0</property>
-                     <property name="expand">True</property>
-                     <property name="fill">True</property>
-                   </packing>
-                 </child>
+             <child>
+               <widget class="GtkButton" id="chatSendButton">
+                 <property name="visible">True</property>
+                 <property name="can_focus">True</property>
+                 <property name="relief">GTK_RELIEF_NORMAL</property>
+                 <property name="focus_on_click">True</property>
+                 <signal name="activate" handler="on_chatSendButton_clicked" 
object="chatFrame" last_modification_time="Mon, 23 May 2005 19:03:19 GMT"/>
+                 <signal name="clicked" handler="on_chatSendButton_clicked" 
object="chatFrame" last_modification_time="Mon, 23 May 2005 19:03:25 GMT"/>
+                 <accelerator key="Return" modifiers="GDK_CONTROL_MASK" 
signal="activate"/>
 
                  <child>
-                   <widget class="GtkButton" id="chatSendButton">
+                   <widget class="GtkAlignment" id="alignment6">
                      <property name="visible">True</property>
-                     <property name="can_focus">True</property>
-                     <property name="relief">GTK_RELIEF_NORMAL</property>
-                     <property name="focus_on_click">True</property>
+                     <property name="xalign">0.5</property>
+                     <property name="yalign">0.5</property>
+                     <property name="xscale">0</property>
+                     <property name="yscale">0</property>
+                     <property name="top_padding">0</property>
+                     <property name="bottom_padding">0</property>
+                     <property name="left_padding">0</property>
+                     <property name="right_padding">0</property>
 
                      <child>
-                       <widget class="GtkAlignment" id="alignment6">
+                       <widget class="GtkHBox" id="hbox19">
                          <property name="visible">True</property>
-                         <property name="xalign">0.5</property>
-                         <property name="yalign">0.5</property>
-                         <property name="xscale">0</property>
-                         <property name="yscale">0</property>
-                         <property name="top_padding">0</property>
-                         <property name="bottom_padding">0</property>
-                         <property name="left_padding">0</property>
-                         <property name="right_padding">0</property>
+                         <property name="homogeneous">False</property>
+                         <property name="spacing">2</property>
 
                          <child>
-                           <widget class="GtkHBox" id="hbox19">
+                           <widget class="GtkImage" id="image6">
                              <property name="visible">True</property>
-                             <property name="homogeneous">False</property>
-                             <property name="spacing">2</property>
+                             <property name="stock">gtk-ok</property>
+                             <property name="icon_size">4</property>
+                             <property name="xalign">0.5</property>
+                             <property name="yalign">0.5</property>
+                             <property name="xpad">0</property>
+                             <property name="ypad">0</property>
+                           </widget>
+                           <packing>
+                             <property name="padding">0</property>
+                             <property name="expand">False</property>
+                             <property name="fill">False</property>
+                           </packing>
+                         </child>
 
-                             <child>
-                               <widget class="GtkImage" id="image6">
-                                 <property name="visible">True</property>
-                                 <property name="stock">gtk-ok</property>
-                                 <property name="icon_size">4</property>
-                                 <property name="xalign">0.5</property>
-                                 <property name="yalign">0.5</property>
-                                 <property name="xpad">0</property>
-                                 <property name="ypad">0</property>
-                               </widget>
-                               <packing>
-                                 <property name="padding">0</property>
-                                 <property name="expand">False</property>
-                                 <property name="fill">False</property>
-                               </packing>
-                             </child>
-
-                             <child>
-                               <widget class="GtkLabel" id="label69">
-                                 <property name="visible">True</property>
-                                 <property name="label" 
translatable="yes">Senden</property>
-                                 <property name="use_underline">True</property>
-                                 <property name="use_markup">False</property>
-                                 <property 
name="justify">GTK_JUSTIFY_LEFT</property>
-                                 <property name="wrap">False</property>
-                                 <property name="selectable">False</property>
-                                 <property name="xalign">0.5</property>
-                                 <property name="yalign">0.5</property>
-                                 <property name="xpad">0</property>
-                                 <property name="ypad">0</property>
-                               </widget>
-                               <packing>
-                                 <property name="padding">0</property>
-                                 <property name="expand">False</property>
-                                 <property name="fill">False</property>
-                               </packing>
-                             </child>
+                         <child>
+                           <widget class="GtkLabel" id="label69">
+                             <property name="visible">True</property>
+                             <property name="label" 
translatable="yes">Senden</property>
+                             <property name="use_underline">True</property>
+                             <property name="use_markup">False</property>
+                             <property 
name="justify">GTK_JUSTIFY_LEFT</property>
+                             <property name="wrap">False</property>
+                             <property name="selectable">False</property>
+                             <property name="xalign">0.5</property>
+                             <property name="yalign">0.5</property>
+                             <property name="xpad">0</property>
+                             <property name="ypad">0</property>
                            </widget>
+                           <packing>
+                             <property name="padding">0</property>
+                             <property name="expand">False</property>
+                             <property name="fill">False</property>
+                           </packing>
                          </child>
                        </widget>
                      </child>
                    </widget>
-                   <packing>
-                     <property name="padding">0</property>
-                     <property name="expand">False</property>
-                     <property name="fill">False</property>
-                   </packing>
                  </child>
                </widget>
                <packing>
                  <property name="padding">0</property>
-                 <property name="expand">True</property>
-                 <property name="fill">True</property>
+                 <property name="expand">False</property>
+                 <property name="fill">False</property>
                </packing>
              </child>
            </widget>
            <packing>
              <property name="padding">0</property>
-             <property name="expand">True</property>
-             <property name="fill">True</property>
+             <property name="expand">False</property>
+             <property name="fill">False</property>
            </packing>
          </child>
        </widget>

Added: gnunet-gtk/m4/codeset.m4
===================================================================
--- gnunet-gtk/m4/codeset.m4    2005-05-24 11:18:12 UTC (rev 806)
+++ gnunet-gtk/m4/codeset.m4    2005-05-24 11:20:25 UTC (rev 807)
@@ -0,0 +1 @@
+link /usr/share/aclocal/codeset.m4
\ No newline at end of file


Property changes on: gnunet-gtk/m4/codeset.m4
___________________________________________________________________
Name: svn:special
   + *

Added: gnunet-gtk/m4/gettext.m4
===================================================================
--- gnunet-gtk/m4/gettext.m4    2005-05-24 11:18:12 UTC (rev 806)
+++ gnunet-gtk/m4/gettext.m4    2005-05-24 11:20:25 UTC (rev 807)
@@ -0,0 +1 @@
+link /usr/share/aclocal/gettext.m4
\ No newline at end of file


Property changes on: gnunet-gtk/m4/gettext.m4
___________________________________________________________________
Name: svn:special
   + *

Added: gnunet-gtk/m4/glibc2.m4
===================================================================
--- gnunet-gtk/m4/glibc2.m4     2005-05-24 11:18:12 UTC (rev 806)
+++ gnunet-gtk/m4/glibc2.m4     2005-05-24 11:20:25 UTC (rev 807)
@@ -0,0 +1 @@
+link /usr/share/aclocal/glibc2.m4
\ No newline at end of file


Property changes on: gnunet-gtk/m4/glibc2.m4
___________________________________________________________________
Name: svn:special
   + *

Added: gnunet-gtk/m4/glibc21.m4
===================================================================
--- gnunet-gtk/m4/glibc21.m4    2005-05-24 11:18:12 UTC (rev 806)
+++ gnunet-gtk/m4/glibc21.m4    2005-05-24 11:20:25 UTC (rev 807)
@@ -0,0 +1 @@
+link /usr/share/aclocal/glibc21.m4
\ No newline at end of file


Property changes on: gnunet-gtk/m4/glibc21.m4
___________________________________________________________________
Name: svn:special
   + *

Added: gnunet-gtk/m4/gtk-2.0.m4
===================================================================
--- gnunet-gtk/m4/gtk-2.0.m4    2005-05-24 11:18:12 UTC (rev 806)
+++ gnunet-gtk/m4/gtk-2.0.m4    2005-05-24 11:20:25 UTC (rev 807)
@@ -0,0 +1,196 @@
+# Configure paths for GTK+
+# Owen Taylor     1997-2001
+
+dnl AM_PATH_GTK_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND 
[, MODULES]]]])
+dnl Test for GTK+, and define GTK_CFLAGS and GTK_LIBS, if gthread is specified 
in MODULES, 
+dnl pass to pkg-config
+dnl
+AC_DEFUN([AM_PATH_GTK_2_0],
+[dnl 
+dnl Get the cflags and libraries from pkg-config
+dnl
+AC_ARG_ENABLE(gtktest, [  --disable-gtktest       do not try to compile and 
run a test GTK+ program],
+                   , enable_gtktest=yes)
+
+  pkg_config_args=gtk+-2.0
+  for module in . $4
+  do
+      case "$module" in
+         gthread) 
+             pkg_config_args="$pkg_config_args gthread-2.0"
+         ;;
+      esac
+  done
+
+  no_gtk=""
+
+  AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+
+  if test x$PKG_CONFIG != xno ; then
+    if pkg-config --atleast-pkgconfig-version 0.7 ; then
+      :
+    else
+      echo "*** pkg-config too old; version 0.7 or better required."
+      no_gtk=yes
+      PKG_CONFIG=no
+    fi
+  else
+    no_gtk=yes
+  fi
+
+  min_gtk_version=ifelse([$1], ,2.0.0,$1)
+  AC_MSG_CHECKING(for GTK+ - version >= $min_gtk_version)
+
+  if test x$PKG_CONFIG != xno ; then
+    ## don't try to run the test against uninstalled libtool libs
+    if $PKG_CONFIG --uninstalled $pkg_config_args; then
+         echo "Will use uninstalled version of GTK+ found in PKG_CONFIG_PATH"
+         enable_gtktest=no
+    fi
+
+    if $PKG_CONFIG --atleast-version $min_gtk_version $pkg_config_args; then
+         :
+    else
+         no_gtk=yes
+    fi
+  fi
+
+  if test x"$no_gtk" = x ; then
+    GTK_CFLAGS=`$PKG_CONFIG $pkg_config_args --cflags`
+    GTK_LIBS=`$PKG_CONFIG $pkg_config_args --libs`
+    gtk_config_major_version=`$PKG_CONFIG --modversion gtk+-2.0 | \
+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
+    gtk_config_minor_version=`$PKG_CONFIG --modversion gtk+-2.0 | \
+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
+    gtk_config_micro_version=`$PKG_CONFIG --modversion gtk+-2.0 | \
+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
+    if test "x$enable_gtktest" = "xyes" ; then
+      ac_save_CFLAGS="$CFLAGS"
+      ac_save_LIBS="$LIBS"
+      CFLAGS="$CFLAGS $GTK_CFLAGS"
+      LIBS="$GTK_LIBS $LIBS"
+dnl
+dnl Now check if the installed GTK+ is sufficiently new. (Also sanity
+dnl checks the results of pkg-config to some extent)
+dnl
+      rm -f conf.gtktest
+      AC_TRY_RUN([
+#include <gtk/gtk.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+int 
+main ()
+{
+  int major, minor, micro;
+  char *tmp_version;
+
+  system ("touch conf.gtktest");
+
+  /* HP/UX 9 (address@hidden) writes to sscanf strings */
+  tmp_version = g_strdup("$min_gtk_version");
+  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
+     printf("%s, bad version string\n", "$min_gtk_version");
+     exit(1);
+   }
+
+  if ((gtk_major_version != $gtk_config_major_version) ||
+      (gtk_minor_version != $gtk_config_minor_version) ||
+      (gtk_micro_version != $gtk_config_micro_version))
+    {
+      printf("\n*** 'pkg-config --modversion gtk+-2.0' returned %d.%d.%d, but 
GTK+ (%d.%d.%d)\n", 
+             $gtk_config_major_version, $gtk_config_minor_version, 
$gtk_config_micro_version,
+             gtk_major_version, gtk_minor_version, gtk_micro_version);
+      printf ("*** was found! If pkg-config was correct, then it is best\n");
+      printf ("*** to remove the old version of GTK+. You may also be able to 
fix the error\n");
+      printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by 
editing\n");
+      printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that 
is\n");
+      printf("*** required on your system.\n");
+      printf("*** If pkg-config was wrong, set the environment variable 
PKG_CONFIG_PATH\n");
+      printf("*** to point to the correct configuration files\n");
+    } 
+  else if ((gtk_major_version != GTK_MAJOR_VERSION) ||
+          (gtk_minor_version != GTK_MINOR_VERSION) ||
+           (gtk_micro_version != GTK_MICRO_VERSION))
+    {
+      printf("*** GTK+ header files (version %d.%d.%d) do not match\n",
+            GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION);
+      printf("*** library (version %d.%d.%d)\n",
+            gtk_major_version, gtk_minor_version, gtk_micro_version);
+    }
+  else
+    {
+      if ((gtk_major_version > major) ||
+        ((gtk_major_version == major) && (gtk_minor_version > minor)) ||
+        ((gtk_major_version == major) && (gtk_minor_version == minor) && 
(gtk_micro_version >= micro)))
+      {
+        return 0;
+       }
+     else
+      {
+        printf("\n*** An old version of GTK+ (%d.%d.%d) was found.\n",
+               gtk_major_version, gtk_minor_version, gtk_micro_version);
+        printf("*** You need a version of GTK+ newer than %d.%d.%d. The latest 
version of\n",
+              major, minor, micro);
+        printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n";);
+        printf("***\n");
+        printf("*** If you have already installed a sufficiently new version, 
this error\n");
+        printf("*** probably means that the wrong copy of the pkg-config shell 
script is\n");
+        printf("*** being found. The easiest way to fix this is to remove the 
old version\n");
+        printf("*** of GTK+, but you can also set the PKG_CONFIG environment 
to point to the\n");
+        printf("*** correct copy of pkg-config. (In this case, you will have 
to\n");
+        printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit 
/etc/ld.so.conf\n");
+        printf("*** so that the correct libraries are found at run-time))\n");
+      }
+    }
+  return 1;
+}
+],, no_gtk=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
+       CFLAGS="$ac_save_CFLAGS"
+       LIBS="$ac_save_LIBS"
+     fi
+  fi
+  if test "x$no_gtk" = x ; then
+     AC_MSG_RESULT(yes (version 
$gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version))
+     ifelse([$2], , :, [$2])     
+  else
+     AC_MSG_RESULT(no)
+     if test "$PKG_CONFIG" = "no" ; then
+       echo "*** A new enough version of pkg-config was not found."
+       echo "*** See http://pkgconfig.sourceforge.net";
+     else
+       if test -f conf.gtktest ; then
+        :
+       else
+          echo "*** Could not run GTK+ test program, checking why..."
+         ac_save_CFLAGS="$CFLAGS"
+         ac_save_LIBS="$LIBS"
+          CFLAGS="$CFLAGS $GTK_CFLAGS"
+          LIBS="$LIBS $GTK_LIBS"
+          AC_TRY_LINK([
+#include <gtk/gtk.h>
+#include <stdio.h>
+],      [ return ((gtk_major_version) || (gtk_minor_version) || 
(gtk_micro_version)); ],
+        [ echo "*** The test program compiled, but did not run. This usually 
means"
+          echo "*** that the run-time linker is not finding GTK+ or finding 
the wrong"
+          echo "*** version of GTK+. If it is not finding GTK+, you'll need to 
set your"
+          echo "*** LD_LIBRARY_PATH environment variable, or edit 
/etc/ld.so.conf to point"
+          echo "*** to the installed location  Also, make sure you have run 
ldconfig if that"
+          echo "*** is required on your system"
+         echo "***"
+          echo "*** If you have an old version installed, it is best to remove 
it, although"
+          echo "*** you may also be able to get things to work by modifying 
LD_LIBRARY_PATH" ],
+        [ echo "*** The test program failed to compile or link. See the file 
config.log for the"
+          echo "*** exact error that occured. This usually means GTK+ is 
incorrectly installed."])
+          CFLAGS="$ac_save_CFLAGS"
+          LIBS="$ac_save_LIBS"
+       fi
+     fi
+     GTK_CFLAGS=""
+     GTK_LIBS=""
+     ifelse([$3], , :, [$3])
+  fi
+  AC_SUBST(GTK_CFLAGS)
+  AC_SUBST(GTK_LIBS)
+  rm -f conf.gtktest
+])

Added: gnunet-gtk/m4/iconv.m4
===================================================================
--- gnunet-gtk/m4/iconv.m4      2005-05-24 11:18:12 UTC (rev 806)
+++ gnunet-gtk/m4/iconv.m4      2005-05-24 11:20:25 UTC (rev 807)
@@ -0,0 +1 @@
+link /usr/share/aclocal/iconv.m4
\ No newline at end of file


Property changes on: gnunet-gtk/m4/iconv.m4
___________________________________________________________________
Name: svn:special
   + *

Added: gnunet-gtk/m4/intdiv0.m4
===================================================================
--- gnunet-gtk/m4/intdiv0.m4    2005-05-24 11:18:12 UTC (rev 806)
+++ gnunet-gtk/m4/intdiv0.m4    2005-05-24 11:20:25 UTC (rev 807)
@@ -0,0 +1 @@
+link /usr/share/aclocal/intdiv0.m4
\ No newline at end of file


Property changes on: gnunet-gtk/m4/intdiv0.m4
___________________________________________________________________
Name: svn:special
   + *

Added: gnunet-gtk/m4/intmax.m4
===================================================================
--- gnunet-gtk/m4/intmax.m4     2005-05-24 11:18:12 UTC (rev 806)
+++ gnunet-gtk/m4/intmax.m4     2005-05-24 11:20:25 UTC (rev 807)
@@ -0,0 +1 @@
+link /usr/share/aclocal/intmax.m4
\ No newline at end of file


Property changes on: gnunet-gtk/m4/intmax.m4
___________________________________________________________________
Name: svn:special
   + *

Added: gnunet-gtk/m4/inttypes-pri.m4
===================================================================
--- gnunet-gtk/m4/inttypes-pri.m4       2005-05-24 11:18:12 UTC (rev 806)
+++ gnunet-gtk/m4/inttypes-pri.m4       2005-05-24 11:20:25 UTC (rev 807)
@@ -0,0 +1 @@
+link /usr/share/aclocal/inttypes-pri.m4
\ No newline at end of file


Property changes on: gnunet-gtk/m4/inttypes-pri.m4
___________________________________________________________________
Name: svn:special
   + *

Added: gnunet-gtk/m4/inttypes.m4
===================================================================
--- gnunet-gtk/m4/inttypes.m4   2005-05-24 11:18:12 UTC (rev 806)
+++ gnunet-gtk/m4/inttypes.m4   2005-05-24 11:20:25 UTC (rev 807)
@@ -0,0 +1 @@
+link /usr/share/aclocal/inttypes.m4
\ No newline at end of file


Property changes on: gnunet-gtk/m4/inttypes.m4
___________________________________________________________________
Name: svn:special
   + *

Added: gnunet-gtk/m4/inttypes_h.m4
===================================================================
--- gnunet-gtk/m4/inttypes_h.m4 2005-05-24 11:18:12 UTC (rev 806)
+++ gnunet-gtk/m4/inttypes_h.m4 2005-05-24 11:20:25 UTC (rev 807)
@@ -0,0 +1 @@
+link /usr/share/aclocal/inttypes_h.m4
\ No newline at end of file


Property changes on: gnunet-gtk/m4/inttypes_h.m4
___________________________________________________________________
Name: svn:special
   + *

Added: gnunet-gtk/m4/isc-posix.m4
===================================================================
--- gnunet-gtk/m4/isc-posix.m4  2005-05-24 11:18:12 UTC (rev 806)
+++ gnunet-gtk/m4/isc-posix.m4  2005-05-24 11:20:25 UTC (rev 807)
@@ -0,0 +1 @@
+link /usr/share/aclocal/isc-posix.m4
\ No newline at end of file


Property changes on: gnunet-gtk/m4/isc-posix.m4
___________________________________________________________________
Name: svn:special
   + *

Added: gnunet-gtk/m4/lcmessage.m4
===================================================================
--- gnunet-gtk/m4/lcmessage.m4  2005-05-24 11:18:12 UTC (rev 806)
+++ gnunet-gtk/m4/lcmessage.m4  2005-05-24 11:20:25 UTC (rev 807)
@@ -0,0 +1 @@
+link /usr/share/aclocal/lcmessage.m4
\ No newline at end of file


Property changes on: gnunet-gtk/m4/lcmessage.m4
___________________________________________________________________
Name: svn:special
   + *

Added: gnunet-gtk/m4/lib-ld.m4
===================================================================
--- gnunet-gtk/m4/lib-ld.m4     2005-05-24 11:18:12 UTC (rev 806)
+++ gnunet-gtk/m4/lib-ld.m4     2005-05-24 11:20:25 UTC (rev 807)
@@ -0,0 +1 @@
+link /usr/share/aclocal/lib-ld.m4
\ No newline at end of file


Property changes on: gnunet-gtk/m4/lib-ld.m4
___________________________________________________________________
Name: svn:special
   + *

Added: gnunet-gtk/m4/lib-link.m4
===================================================================
--- gnunet-gtk/m4/lib-link.m4   2005-05-24 11:18:12 UTC (rev 806)
+++ gnunet-gtk/m4/lib-link.m4   2005-05-24 11:20:25 UTC (rev 807)
@@ -0,0 +1 @@
+link /usr/share/aclocal/lib-link.m4
\ No newline at end of file


Property changes on: gnunet-gtk/m4/lib-link.m4
___________________________________________________________________
Name: svn:special
   + *

Added: gnunet-gtk/m4/lib-prefix.m4
===================================================================
--- gnunet-gtk/m4/lib-prefix.m4 2005-05-24 11:18:12 UTC (rev 806)
+++ gnunet-gtk/m4/lib-prefix.m4 2005-05-24 11:20:25 UTC (rev 807)
@@ -0,0 +1 @@
+link /usr/share/aclocal/lib-prefix.m4
\ No newline at end of file


Property changes on: gnunet-gtk/m4/lib-prefix.m4
___________________________________________________________________
Name: svn:special
   + *

Added: gnunet-gtk/m4/longdouble.m4
===================================================================
--- gnunet-gtk/m4/longdouble.m4 2005-05-24 11:18:12 UTC (rev 806)
+++ gnunet-gtk/m4/longdouble.m4 2005-05-24 11:20:25 UTC (rev 807)
@@ -0,0 +1 @@
+link /usr/share/aclocal/longdouble.m4
\ No newline at end of file


Property changes on: gnunet-gtk/m4/longdouble.m4
___________________________________________________________________
Name: svn:special
   + *

Added: gnunet-gtk/m4/longlong.m4
===================================================================
--- gnunet-gtk/m4/longlong.m4   2005-05-24 11:18:12 UTC (rev 806)
+++ gnunet-gtk/m4/longlong.m4   2005-05-24 11:20:25 UTC (rev 807)
@@ -0,0 +1 @@
+link /usr/share/aclocal/longlong.m4
\ No newline at end of file


Property changes on: gnunet-gtk/m4/longlong.m4
___________________________________________________________________
Name: svn:special
   + *

Added: gnunet-gtk/m4/nls.m4
===================================================================
--- gnunet-gtk/m4/nls.m4        2005-05-24 11:18:12 UTC (rev 806)
+++ gnunet-gtk/m4/nls.m4        2005-05-24 11:20:25 UTC (rev 807)
@@ -0,0 +1 @@
+link /usr/share/aclocal/nls.m4
\ No newline at end of file


Property changes on: gnunet-gtk/m4/nls.m4
___________________________________________________________________
Name: svn:special
   + *

Added: gnunet-gtk/m4/po.m4
===================================================================
--- gnunet-gtk/m4/po.m4 2005-05-24 11:18:12 UTC (rev 806)
+++ gnunet-gtk/m4/po.m4 2005-05-24 11:20:25 UTC (rev 807)
@@ -0,0 +1 @@
+link /usr/share/aclocal/po.m4
\ No newline at end of file


Property changes on: gnunet-gtk/m4/po.m4
___________________________________________________________________
Name: svn:special
   + *

Added: gnunet-gtk/m4/printf-posix.m4
===================================================================
--- gnunet-gtk/m4/printf-posix.m4       2005-05-24 11:18:12 UTC (rev 806)
+++ gnunet-gtk/m4/printf-posix.m4       2005-05-24 11:20:25 UTC (rev 807)
@@ -0,0 +1 @@
+link /usr/share/aclocal/printf-posix.m4
\ No newline at end of file


Property changes on: gnunet-gtk/m4/printf-posix.m4
___________________________________________________________________
Name: svn:special
   + *

Added: gnunet-gtk/m4/progtest.m4
===================================================================
--- gnunet-gtk/m4/progtest.m4   2005-05-24 11:18:12 UTC (rev 806)
+++ gnunet-gtk/m4/progtest.m4   2005-05-24 11:20:25 UTC (rev 807)
@@ -0,0 +1 @@
+link /usr/share/aclocal/progtest.m4
\ No newline at end of file


Property changes on: gnunet-gtk/m4/progtest.m4
___________________________________________________________________
Name: svn:special
   + *

Added: gnunet-gtk/m4/signed.m4
===================================================================
--- gnunet-gtk/m4/signed.m4     2005-05-24 11:18:12 UTC (rev 806)
+++ gnunet-gtk/m4/signed.m4     2005-05-24 11:20:25 UTC (rev 807)
@@ -0,0 +1 @@
+link /usr/share/aclocal/signed.m4
\ No newline at end of file


Property changes on: gnunet-gtk/m4/signed.m4
___________________________________________________________________
Name: svn:special
   + *

Added: gnunet-gtk/m4/size_max.m4
===================================================================
--- gnunet-gtk/m4/size_max.m4   2005-05-24 11:18:12 UTC (rev 806)
+++ gnunet-gtk/m4/size_max.m4   2005-05-24 11:20:25 UTC (rev 807)
@@ -0,0 +1 @@
+link /usr/share/aclocal/size_max.m4
\ No newline at end of file


Property changes on: gnunet-gtk/m4/size_max.m4
___________________________________________________________________
Name: svn:special
   + *

Added: gnunet-gtk/m4/stdint_h.m4
===================================================================
--- gnunet-gtk/m4/stdint_h.m4   2005-05-24 11:18:12 UTC (rev 806)
+++ gnunet-gtk/m4/stdint_h.m4   2005-05-24 11:20:25 UTC (rev 807)
@@ -0,0 +1 @@
+link /usr/share/aclocal/stdint_h.m4
\ No newline at end of file


Property changes on: gnunet-gtk/m4/stdint_h.m4
___________________________________________________________________
Name: svn:special
   + *

Added: gnunet-gtk/m4/uintmax_t.m4
===================================================================
--- gnunet-gtk/m4/uintmax_t.m4  2005-05-24 11:18:12 UTC (rev 806)
+++ gnunet-gtk/m4/uintmax_t.m4  2005-05-24 11:20:25 UTC (rev 807)
@@ -0,0 +1 @@
+link /usr/share/aclocal/uintmax_t.m4
\ No newline at end of file


Property changes on: gnunet-gtk/m4/uintmax_t.m4
___________________________________________________________________
Name: svn:special
   + *

Added: gnunet-gtk/m4/ulonglong.m4
===================================================================
--- gnunet-gtk/m4/ulonglong.m4  2005-05-24 11:18:12 UTC (rev 806)
+++ gnunet-gtk/m4/ulonglong.m4  2005-05-24 11:20:25 UTC (rev 807)
@@ -0,0 +1 @@
+link /usr/share/aclocal/ulonglong.m4
\ No newline at end of file


Property changes on: gnunet-gtk/m4/ulonglong.m4
___________________________________________________________________
Name: svn:special
   + *

Added: gnunet-gtk/m4/wchar_t.m4
===================================================================
--- gnunet-gtk/m4/wchar_t.m4    2005-05-24 11:18:12 UTC (rev 806)
+++ gnunet-gtk/m4/wchar_t.m4    2005-05-24 11:20:25 UTC (rev 807)
@@ -0,0 +1 @@
+link /usr/share/aclocal/wchar_t.m4
\ No newline at end of file


Property changes on: gnunet-gtk/m4/wchar_t.m4
___________________________________________________________________
Name: svn:special
   + *

Added: gnunet-gtk/m4/wint_t.m4
===================================================================
--- gnunet-gtk/m4/wint_t.m4     2005-05-24 11:18:12 UTC (rev 806)
+++ gnunet-gtk/m4/wint_t.m4     2005-05-24 11:20:25 UTC (rev 807)
@@ -0,0 +1 @@
+link /usr/share/aclocal/wint_t.m4
\ No newline at end of file


Property changes on: gnunet-gtk/m4/wint_t.m4
___________________________________________________________________
Name: svn:special
   + *

Added: gnunet-gtk/m4/xsize.m4
===================================================================
--- gnunet-gtk/m4/xsize.m4      2005-05-24 11:18:12 UTC (rev 806)
+++ gnunet-gtk/m4/xsize.m4      2005-05-24 11:20:25 UTC (rev 807)
@@ -0,0 +1 @@
+link /usr/share/aclocal/xsize.m4
\ No newline at end of file


Property changes on: gnunet-gtk/m4/xsize.m4
___________________________________________________________________
Name: svn:special
   + *

Added: gnunet-gtk/pixmaps/gnunet_logo.png
===================================================================
(Binary files differ)


Property changes on: gnunet-gtk/pixmaps/gnunet_logo.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: gnunet-gtk/pixmaps/info.png
===================================================================
(Binary files differ)


Property changes on: gnunet-gtk/pixmaps/info.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: gnunet-gtk/po/ChangeLog
===================================================================
--- gnunet-gtk/po/ChangeLog     2005-05-24 11:18:12 UTC (rev 806)
+++ gnunet-gtk/po/ChangeLog     2005-05-24 11:20:25 UTC (rev 807)
@@ -0,0 +1,4 @@
+2005-05-23  gettextize  <address@hidden>
+
+       * Makefile.in.in: Upgrade to gettext-0.14.4.
+

Added: gnunet-gtk/po/LINGUAS
===================================================================

Added: gnunet-gtk/po/Makefile.in
===================================================================
--- gnunet-gtk/po/Makefile.in   2005-05-24 11:18:12 UTC (rev 806)
+++ gnunet-gtk/po/Makefile.in   2005-05-24 11:20:25 UTC (rev 807)
@@ -0,0 +1,384 @@
+# Makefile for PO directory in any package using GNU gettext.
+# Copyright (C) 1995-1997, 2000-2005 by Ulrich Drepper <address@hidden>
+#
+# This file can be copied and used freely without restrictions.  It can
+# be used in projects which are not available under the GNU General Public
+# License but which still want to provide support for the GNU gettext
+# functionality.
+# Please note that the actual code of GNU gettext is covered by the GNU
+# General Public License and is *not* in the public domain.
+#
+# Origin: gettext-0.14.4
+
+PACKAGE = gnunet-gtk
+VERSION = 0.0.0
+PACKAGE_BUGREPORT = address@hidden
+
+SHELL = /bin/sh
+
+
+srcdir = .
+top_srcdir = ..
+
+
+prefix = /home/grothoff/
+exec_prefix = ${prefix}
+datadir = ${prefix}/share
+localedir = $(datadir)/locale
+gettextsrcdir = $(datadir)/gettext/po
+
+INSTALL = /usr/bin/install -c
+INSTALL_DATA = ${INSTALL} -m 644
+MKINSTALLDIRS = $(top_builddir)/./mkinstalldirs
+mkinstalldirs = $(SHELL) $(MKINSTALLDIRS)
+
+GMSGFMT = /usr/bin/msgfmt
+MSGFMT = /usr/bin/msgfmt
+XGETTEXT = /usr/bin/xgettext
+MSGMERGE = msgmerge
+MSGMERGE_UPDATE = /usr/bin/msgmerge --update
+MSGINIT = msginit
+MSGCONV = msgconv
+MSGFILTER = msgfilter
+
+POFILES = @POFILES@
+GMOFILES = @GMOFILES@
+UPDATEPOFILES = @UPDATEPOFILES@
+DUMMYPOFILES = @DUMMYPOFILES@
+DISTFILES.common = Makefile.in.in remove-potcdate.sin \
+$(DISTFILES.common.extra1) $(DISTFILES.common.extra2) 
$(DISTFILES.common.extra3)
+DISTFILES = $(DISTFILES.common) Makevars POTFILES.in \
+$(POFILES) $(GMOFILES) \
+$(DISTFILES.extra1) $(DISTFILES.extra2) $(DISTFILES.extra3)
+
+POTFILES = \
+
+CATALOGS = @CATALOGS@
+
+# Makevars gets inserted here. (Don't remove this line!)
+
+.SUFFIXES:
+.SUFFIXES: .po .gmo .mo .sed .sin .nop .po-create .po-update
+
+.po.mo:
+       @echo "$(MSGFMT) -c -o $@ $<"; \
+       $(MSGFMT) -c -o t-$@ $< && mv t-$@ $@
+
+.po.gmo:
+       @lang=`echo $* | sed -e 's,.*/,,'`; \
+       test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
+       echo "$${cdcmd}rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics -o 
$${lang}.gmo $${lang}.po"; \
+       cd $(srcdir) && rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics -o 
t-$${lang}.gmo $${lang}.po && mv t-$${lang}.gmo $${lang}.gmo
+
+.sin.sed:
+       sed -e '/^#/d' $< > t-$@
+       mv t-$@ $@
+
+
+all: all-yes
+
+all-yes: stamp-po
+all-no:
+
+# $(srcdir)/$(DOMAIN).pot is only created when needed. When xgettext finds no
+# internationalized messages, no $(srcdir)/$(DOMAIN).pot is created (because
+# we don't want to bother translators with empty POT files). We assume that
+# LINGUAS is empty in this case, i.e. $(POFILES) and $(GMOFILES) are empty.
+# In this case, stamp-po is a nop (i.e. a phony target).
+
+# stamp-po is a timestamp denoting the last time at which the CATALOGS have
+# been loosely updated. Its purpose is that when a developer or translator
+# checks out the package via CVS, and the $(DOMAIN).pot file is not in CVS,
+# "make" will update the $(DOMAIN).pot and the $(CATALOGS), but subsequent
+# invocations of "make" will do nothing. This timestamp would not be necessary
+# if updating the $(CATALOGS) would always touch them; however, the rule for
+# $(POFILES) has been designed to not touch files that don't need to be
+# changed.
+stamp-po: $(srcdir)/$(DOMAIN).pot
+       test ! -f $(srcdir)/$(DOMAIN).pot || \
+         test -z "$(GMOFILES)" || $(MAKE) $(GMOFILES)
+       @test ! -f $(srcdir)/$(DOMAIN).pot || { \
+         echo "touch stamp-po" && \
+         echo timestamp > stamp-poT && \
+         mv stamp-poT stamp-po; \
+       }
+
+# Note: Target 'all' must not depend on target '$(DOMAIN).pot-update',
+# otherwise packages like GCC can not be built if only parts of the source
+# have been downloaded.
+
+# This target rebuilds $(DOMAIN).pot; it is an expensive operation.
+# Note that $(DOMAIN).pot is not touched if it doesn't need to be changed.
+$(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed
+       if test -n '$(MSGID_BUGS_ADDRESS)' || test '$(PACKAGE_BUGREPORT)' = 
'@'PACKAGE_BUGREPORT'@'; then \
+         msgid_bugs_address='$(MSGID_BUGS_ADDRESS)'; \
+       else \
+         msgid_bugs_address='$(PACKAGE_BUGREPORT)'; \
+       fi; \
+       $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
+         --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) \
+         --files-from=$(srcdir)/POTFILES.in \
+         --copyright-holder='$(COPYRIGHT_HOLDER)' \
+         --msgid-bugs-address="$$msgid_bugs_address"
+       test ! -f $(DOMAIN).po || { \
+         if test -f $(srcdir)/$(DOMAIN).pot; then \
+           sed -f remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot > 
$(DOMAIN).1po && \
+           sed -f remove-potcdate.sed < $(DOMAIN).po > $(DOMAIN).2po && \
+           if cmp $(DOMAIN).1po $(DOMAIN).2po >/dev/null 2>&1; then \
+             rm -f $(DOMAIN).1po $(DOMAIN).2po $(DOMAIN).po; \
+           else \
+             rm -f $(DOMAIN).1po $(DOMAIN).2po $(srcdir)/$(DOMAIN).pot && \
+             mv $(DOMAIN).po $(srcdir)/$(DOMAIN).pot; \
+           fi; \
+         else \
+           mv $(DOMAIN).po $(srcdir)/$(DOMAIN).pot; \
+         fi; \
+       }
+
+# This rule has no dependencies: we don't need to update $(DOMAIN).pot at
+# every "make" invocation, only create it when it is missing.
+# Only "make $(DOMAIN).pot-update" or "make dist" will force an update.
+$(srcdir)/$(DOMAIN).pot:
+       $(MAKE) $(DOMAIN).pot-update
+
+# This target rebuilds a PO file if $(DOMAIN).pot has changed.
+# Note that a PO file is not touched if it doesn't need to be changed.
+$(POFILES): $(srcdir)/$(DOMAIN).pot
+       @lang=`echo $@ | sed -e 's,.*/,,' -e 's/\.po$$//'`; \
+       if test -f "$(srcdir)/$${lang}.po"; then \
+         test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
+         echo "$${cdcmd}$(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot"; \
+         cd $(srcdir) && $(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot; \
+       else \
+         $(MAKE) $${lang}.po-create; \
+       fi
+
+
+install: install-exec install-data
+install-exec:
+install-data: install-data-yes
+       if test "$(PACKAGE)" = "gettext-tools"; then \
+         $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
+         for file in $(DISTFILES.common) Makevars.template; do \
+           $(INSTALL_DATA) $(srcdir)/$$file \
+                           $(DESTDIR)$(gettextsrcdir)/$$file; \
+         done; \
+         for file in Makevars; do \
+           rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \
+         done; \
+       else \
+         : ; \
+       fi
+install-data-no: all
+install-data-yes: all
+       $(mkinstalldirs) $(DESTDIR)$(datadir)
+       @catalogs='$(CATALOGS)'; \
+       for cat in $$catalogs; do \
+         cat=`basename $$cat`; \
+         lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
+         dir=$(localedir)/$$lang/LC_MESSAGES; \
+         $(mkinstalldirs) $(DESTDIR)$$dir; \
+         if test -r $$cat; then realcat=$$cat; else realcat=$(srcdir)/$$cat; 
fi; \
+         $(INSTALL_DATA) $$realcat $(DESTDIR)$$dir/$(DOMAIN).mo; \
+         echo "installing $$realcat as $(DESTDIR)$$dir/$(DOMAIN).mo"; \
+         for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \
+           if test -n "$$lc"; then \
+             if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 
2>/dev/null) | grep ' -> ' >/dev/null; then \
+               link=`cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d 
$$lc | sed -e 's/^.* -> //'`; \
+               mv $(DESTDIR)$(localedir)/$$lang/$$lc 
$(DESTDIR)$(localedir)/$$lang/$$lc.old; \
+               mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
+               (cd $(DESTDIR)$(localedir)/$$lang/$$lc.old && \
+                for file in *; do \
+                  if test -f $$file; then \
+                    ln -s ../$$link/$$file 
$(DESTDIR)$(localedir)/$$lang/$$lc/$$file; \
+                  fi; \
+                done); \
+               rm -f $(DESTDIR)$(localedir)/$$lang/$$lc.old; \
+             else \
+               if test -d $(DESTDIR)$(localedir)/$$lang/$$lc; then \
+                 :; \
+               else \
+                 rm -f $(DESTDIR)$(localedir)/$$lang/$$lc; \
+                 mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
+               fi; \
+             fi; \
+             rm -f $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \
+             ln -s ../LC_MESSAGES/$(DOMAIN).mo 
$(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo 2>/dev/null || \
+             ln $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(DOMAIN).mo 
$(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo 2>/dev/null || \
+             cp -p $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(DOMAIN).mo 
$(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \
+             echo "installing $$realcat link as 
$(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo"; \
+           fi; \
+         done; \
+       done
+
+install-strip: install
+
+installdirs: installdirs-exec installdirs-data
+installdirs-exec:
+installdirs-data: installdirs-data-yes
+       if test "$(PACKAGE)" = "gettext-tools"; then \
+         $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
+       else \
+         : ; \
+       fi
+installdirs-data-no:
+installdirs-data-yes:
+       $(mkinstalldirs) $(DESTDIR)$(datadir)
+       @catalogs='$(CATALOGS)'; \
+       for cat in $$catalogs; do \
+         cat=`basename $$cat`; \
+         lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
+         dir=$(localedir)/$$lang/LC_MESSAGES; \
+         $(mkinstalldirs) $(DESTDIR)$$dir; \
+         for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \
+           if test -n "$$lc"; then \
+             if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 
2>/dev/null) | grep ' -> ' >/dev/null; then \
+               link=`cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d 
$$lc | sed -e 's/^.* -> //'`; \
+               mv $(DESTDIR)$(localedir)/$$lang/$$lc 
$(DESTDIR)$(localedir)/$$lang/$$lc.old; \
+               mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
+               (cd $(DESTDIR)$(localedir)/$$lang/$$lc.old && \
+                for file in *; do \
+                  if test -f $$file; then \
+                    ln -s ../$$link/$$file 
$(DESTDIR)$(localedir)/$$lang/$$lc/$$file; \
+                  fi; \
+                done); \
+               rm -f $(DESTDIR)$(localedir)/$$lang/$$lc.old; \
+             else \
+               if test -d $(DESTDIR)$(localedir)/$$lang/$$lc; then \
+                 :; \
+               else \
+                 rm -f $(DESTDIR)$(localedir)/$$lang/$$lc; \
+                 mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
+               fi; \
+             fi; \
+           fi; \
+         done; \
+       done
+
+# Define this as empty until I found a useful application.
+installcheck:
+
+uninstall: uninstall-exec uninstall-data
+uninstall-exec:
+uninstall-data: uninstall-data-yes
+       if test "$(PACKAGE)" = "gettext-tools"; then \
+         for file in $(DISTFILES.common) Makevars.template; do \
+           rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \
+         done; \
+       else \
+         : ; \
+       fi
+uninstall-data-no:
+uninstall-data-yes:
+       catalogs='$(CATALOGS)'; \
+       for cat in $$catalogs; do \
+         cat=`basename $$cat`; \
+         lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
+         for lc in LC_MESSAGES $(EXTRA_LOCALE_CATEGORIES); do \
+           rm -f $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \
+         done; \
+       done
+
+check: all
+
+info dvi ps pdf html tags TAGS ctags CTAGS ID:
+
+mostlyclean:
+       rm -f remove-potcdate.sed
+       rm -f stamp-poT
+       rm -f core core.* $(DOMAIN).po $(DOMAIN).1po $(DOMAIN).2po *.new.po
+       rm -fr *.o
+
+clean: mostlyclean
+
+distclean: clean
+       rm -f Makefile Makefile.in POTFILES *.mo
+
+maintainer-clean: distclean
+       @echo "This command is intended for maintainers to use;"
+       @echo "it deletes files that may require special tools to rebuild."
+       rm -f stamp-po $(GMOFILES)
+
+distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
+dist distdir:
+       $(MAKE) update-po
+       @$(MAKE) dist2
+# This is a separate target because 'update-po' must be executed before.
+dist2: stamp-po $(DISTFILES)
+       dists="$(DISTFILES)"; \
+       if test "$(PACKAGE)" = "gettext-tools"; then \
+         dists="$$dists Makevars.template"; \
+       fi; \
+       if test -f $(srcdir)/$(DOMAIN).pot; then \
+         dists="$$dists $(DOMAIN).pot stamp-po"; \
+       fi; \
+       if test -f $(srcdir)/ChangeLog; then \
+         dists="$$dists ChangeLog"; \
+       fi; \
+       for i in 0 1 2 3 4 5 6 7 8 9; do \
+         if test -f $(srcdir)/ChangeLog.$$i; then \
+           dists="$$dists ChangeLog.$$i"; \
+         fi; \
+       done; \
+       if test -f $(srcdir)/LINGUAS; then dists="$$dists LINGUAS"; fi; \
+       for file in $$dists; do \
+         if test -f $$file; then \
+           cp -p $$file $(distdir) || exit 1; \
+         else \
+           cp -p $(srcdir)/$$file $(distdir) || exit 1; \
+         fi; \
+       done
+
+update-po: Makefile
+       $(MAKE) $(DOMAIN).pot-update
+       test -z "$(UPDATEPOFILES)" || $(MAKE) $(UPDATEPOFILES)
+       $(MAKE) update-gmo
+
+# General rule for creating PO files.
+
+.nop.po-create:
+       @lang=`echo $@ | sed -e 's/\.po-create$$//'`; \
+       echo "File $$lang.po does not exist. If you are a translator, you can 
create it through 'msginit'." 1>&2; \
+       exit 1
+
+# General rule for updating PO files.
+
+.nop.po-update:
+       @lang=`echo $@ | sed -e 's/\.po-update$$//'`; \
+       if test "$(PACKAGE)" = "gettext-tools"; then PATH=`pwd`/../src:$$PATH; 
fi; \
+       tmpdir=`pwd`; \
+       echo "$$lang:"; \
+       test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
+       echo "$${cdcmd}$(MSGMERGE) $$lang.po $(DOMAIN).pot -o $$lang.new.po"; \
+       cd $(srcdir); \
+       if $(MSGMERGE) $$lang.po $(DOMAIN).pot -o $$tmpdir/$$lang.new.po; then \
+         if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
+           rm -f $$tmpdir/$$lang.new.po; \
+         else \
+           if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \
+             :; \
+           else \
+             echo "msgmerge for $$lang.po failed: cannot move 
$$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \
+             exit 1; \
+           fi; \
+         fi; \
+       else \
+         echo "msgmerge for $$lang.po failed!" 1>&2; \
+         rm -f $$tmpdir/$$lang.new.po; \
+       fi
+
+$(DUMMYPOFILES):
+
+update-gmo: Makefile $(GMOFILES)
+       @:
+
+Makefile: Makefile.in.in Makevars $(top_builddir)/config.status 
@POMAKEFILEDEPS@
+       cd $(top_builddir) \
+         && CONFIG_FILES=$(subdir)/address@hidden CONFIG_HEADERS= \
+              $(SHELL) ./config.status
+
+force:
+
+# Tell versions [3.59,3.63) of GNU make not to export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:

Added: gnunet-gtk/po/Makefile.in.in
===================================================================
--- gnunet-gtk/po/Makefile.in.in        2005-05-24 11:18:12 UTC (rev 806)
+++ gnunet-gtk/po/Makefile.in.in        2005-05-24 11:20:25 UTC (rev 807)
@@ -0,0 +1 @@
+link /usr/share/gettext/po/Makefile.in.in
\ No newline at end of file


Property changes on: gnunet-gtk/po/Makefile.in.in
___________________________________________________________________
Name: svn:special
   + *

Added: gnunet-gtk/po/Makevars
===================================================================
--- gnunet-gtk/po/Makevars      2005-05-24 11:18:12 UTC (rev 806)
+++ gnunet-gtk/po/Makevars      2005-05-24 11:20:25 UTC (rev 807)
@@ -0,0 +1,41 @@
+# Makefile variables for PO directory in any package using GNU gettext.
+
+# Usually the message domain is the same as the package name.
+DOMAIN = $(PACKAGE)
+
+# These two variables depend on the location of this directory.
+subdir = po
+top_builddir = ..
+
+# These options get passed to xgettext.
+XGETTEXT_OPTIONS = --keyword=_ --keyword=N_
+
+# This is the copyright holder that gets inserted into the header of the
+# $(DOMAIN).pot file.  Set this to the copyright holder of the surrounding
+# package.  (Note that the msgstr strings, extracted from the package's
+# sources, belong to the copyright holder of the package.)  Translators are
+# expected to transfer the copyright for their translations to this person
+# or entity, or to disclaim their copyright.  The empty string stands for
+# the public domain; in this case the translators are expected to disclaim
+# their copyright.
+COPYRIGHT_HOLDER = Christian Grothoff <address@hidden>
+
+# This is the email address or URL to which the translators shall report
+# bugs in the untranslated strings:
+# - Strings which are not entire sentences, see the maintainer guidelines
+#   in the GNU gettext documentation, section 'Preparing Strings'.
+# - Strings which use unclear terms or require additional context to be
+#   understood.
+# - Strings which make invalid assumptions about notation of date, time or
+#   money.
+# - Pluralisation problems.
+# - Incorrect English spelling.
+# - Incorrect formatting.
+# It can be your email address, or a mailing list address where translators
+# can write to without being subscribed, or the URL of a web page through
+# which the translators can contact you.
+MSGID_BUGS_ADDRESS = address@hidden
+
+# This is the list of locale categories, beyond LC_MESSAGES, for which the
+# message catalogs shall be used.  It is usually empty.
+EXTRA_LOCALE_CATEGORIES =

Added: gnunet-gtk/po/POTFILES
===================================================================
--- gnunet-gtk/po/POTFILES      2005-05-24 11:18:12 UTC (rev 806)
+++ gnunet-gtk/po/POTFILES      2005-05-24 11:20:25 UTC (rev 807)
@@ -0,0 +1,4 @@
+     ../src/main.c \
+     ../src/interface.c \
+     ../src/callbacks.c \
+     ../src/support.c

Added: gnunet-gtk/po/Rules-quot
===================================================================
--- gnunet-gtk/po/Rules-quot    2005-05-24 11:18:12 UTC (rev 806)
+++ gnunet-gtk/po/Rules-quot    2005-05-24 11:20:25 UTC (rev 807)
@@ -0,0 +1 @@
+link /usr/share/gettext/po/Rules-quot
\ No newline at end of file


Property changes on: gnunet-gtk/po/Rules-quot
___________________________________________________________________
Name: svn:special
   + *

Added: gnunet-gtk/po/address@hidden
===================================================================
--- gnunet-gtk/po/address@hidden        2005-05-24 11:18:12 UTC (rev 806)
+++ gnunet-gtk/po/address@hidden        2005-05-24 11:20:25 UTC (rev 807)
@@ -0,0 +1 @@
+link /usr/share/gettext/po/address@hidden
\ No newline at end of file


Property changes on: gnunet-gtk/po/address@hidden
___________________________________________________________________
Name: svn:special
   + *

Added: gnunet-gtk/po/address@hidden
===================================================================
--- gnunet-gtk/po/address@hidden        2005-05-24 11:18:12 UTC (rev 806)
+++ gnunet-gtk/po/address@hidden        2005-05-24 11:20:25 UTC (rev 807)
@@ -0,0 +1,25 @@
+# All this catalog "translates" are quotation characters.
+# The msgids must be ASCII and therefore cannot contain real quotation
+# characters, only substitutes like grave accent (0x60), apostrophe (0x27)
+# and double quote (0x22). These substitutes look strange; see
+# http://www.cl.cam.ac.uk/~mgk25/ucs/quotes.html
+#
+# This catalog translates grave accent (0x60) and apostrophe (0x27) to
+# left single quotation mark (U+2018) and right single quotation mark (U+2019).
+# It also translates pairs of apostrophe (0x27) to
+# left single quotation mark (U+2018) and right single quotation mark (U+2019)
+# and pairs of quotation mark (0x22) to
+# left double quotation mark (U+201C) and right double quotation mark (U+201D).
+#
+# When output to an UTF-8 terminal, the quotation characters appear perfectly.
+# When output to an ISO-8859-1 terminal, the single quotation marks are
+# transliterated to apostrophes (by iconv in glibc 2.2 or newer) or to
+# grave/acute accent (by libiconv), and the double quotation marks are
+# transliterated to 0x22.
+# When output to an ASCII terminal, the single quotation marks are
+# transliterated to apostrophes, and the double quotation marks are
+# transliterated to 0x22.
+#
+# This catalog furthermore displays the text between the quotation marks in
+# bold face, assuming the VT100/XTerm escape sequences.
+#

Added: gnunet-gtk/po/address@hidden
===================================================================
--- gnunet-gtk/po/address@hidden        2005-05-24 11:18:12 UTC (rev 806)
+++ gnunet-gtk/po/address@hidden        2005-05-24 11:20:25 UTC (rev 807)
@@ -0,0 +1 @@
+link /usr/share/gettext/po/address@hidden
\ No newline at end of file


Property changes on: gnunet-gtk/po/address@hidden
___________________________________________________________________
Name: svn:special
   + *

Added: gnunet-gtk/po/address@hidden
===================================================================
--- gnunet-gtk/po/address@hidden        2005-05-24 11:18:12 UTC (rev 806)
+++ gnunet-gtk/po/address@hidden        2005-05-24 11:20:25 UTC (rev 807)
@@ -0,0 +1,22 @@
+# All this catalog "translates" are quotation characters.
+# The msgids must be ASCII and therefore cannot contain real quotation
+# characters, only substitutes like grave accent (0x60), apostrophe (0x27)
+# and double quote (0x22). These substitutes look strange; see
+# http://www.cl.cam.ac.uk/~mgk25/ucs/quotes.html
+#
+# This catalog translates grave accent (0x60) and apostrophe (0x27) to
+# left single quotation mark (U+2018) and right single quotation mark (U+2019).
+# It also translates pairs of apostrophe (0x27) to
+# left single quotation mark (U+2018) and right single quotation mark (U+2019)
+# and pairs of quotation mark (0x22) to
+# left double quotation mark (U+201C) and right double quotation mark (U+201D).
+#
+# When output to an UTF-8 terminal, the quotation characters appear perfectly.
+# When output to an ISO-8859-1 terminal, the single quotation marks are
+# transliterated to apostrophes (by iconv in glibc 2.2 or newer) or to
+# grave/acute accent (by libiconv), and the double quotation marks are
+# transliterated to 0x22.
+# When output to an ASCII terminal, the single quotation marks are
+# transliterated to apostrophes, and the double quotation marks are
+# transliterated to 0x22.
+#

Added: gnunet-gtk/po/gnunet-gtk.pot
===================================================================
--- gnunet-gtk/po/gnunet-gtk.pot        2005-05-24 11:18:12 UTC (rev 806)
+++ gnunet-gtk/po/gnunet-gtk.pot        2005-05-24 11:20:25 UTC (rev 807)
@@ -0,0 +1,326 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR Christian Grothoff <address@hidden>
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <address@hidden>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: address@hidden"
+"POT-Creation-Date: 2005-05-23 13:03-0500\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <address@hidden>\n"
+"Language-Team: LANGUAGE <address@hidden>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: src/interface.c:168
+msgid "gnunet-gtk"
+msgstr ""
+
+#: src/interface.c:186
+msgid "_Quit"
+msgstr ""
+
+#: src/interface.c:191
+msgid "_Help"
+msgstr ""
+
+#: src/interface.c:200
+msgid "_About"
+msgstr ""
+
+#: src/interface.c:214
+msgid "Welcome to GNUnet\n"
+msgstr ""
+
+#: src/interface.c:221
+msgid "_Welcome"
+msgstr ""
+
+#: src/interface.c:285
+msgid "_start gnunetd"
+msgstr ""
+
+#: src/interface.c:295
+msgid "disconnect from GNUnet"
+msgstr ""
+
+#: src/interface.c:312
+msgid "s_top gnunetd"
+msgstr ""
+
+#: src/interface.c:322
+msgid "gnunetd control"
+msgstr ""
+
+#: src/interface.c:332
+msgid "Unavailable.\n"
+msgstr ""
+
+#: src/interface.c:338
+msgid "Statistics"
+msgstr ""
+
+#: src/interface.c:361
+msgid "Available Applications"
+msgstr ""
+
+#: src/interface.c:366
+msgid "_General"
+msgstr ""
+
+#: src/interface.c:400 src/interface.c:1390
+msgid "Search Results"
+msgstr ""
+
+#: src/interface.c:423
+msgid "Downloads"
+msgstr ""
+
+#: src/interface.c:446
+msgid "Uploads"
+msgstr ""
+
+#: src/interface.c:451
+msgid "S_tatus"
+msgstr ""
+
+#: src/interface.c:467
+msgid "label61"
+msgstr ""
+
+#: src/interface.c:472
+msgid "label36"
+msgstr ""
+
+#: src/interface.c:523
+msgid "_Search"
+msgstr ""
+
+#: src/interface.c:528
+msgid "in namespace"
+msgstr ""
+
+#: src/interface.c:543
+msgid "global (everywhere)"
+msgstr ""
+
+#: src/interface.c:550 src/interface.c:1442
+msgid "_Download"
+msgstr ""
+
+#: src/interface.c:566
+msgid "index"
+msgstr ""
+
+#: src/interface.c:574
+msgid "insert"
+msgstr ""
+
+#: src/interface.c:586
+msgid "file only"
+msgstr ""
+
+#: src/interface.c:594
+msgid "recursive (for entire directories)"
+msgstr ""
+
+#: src/interface.c:606
+msgid "_Filename"
+msgstr ""
+
+#: src/interface.c:647
+msgid "_Browse"
+msgstr ""
+
+#: src/interface.c:652 src/interface.c:1529
+msgid "_Insert"
+msgstr ""
+
+#: src/interface.c:668
+msgid "_create"
+msgstr ""
+
+#: src/interface.c:677 src/interface.c:706
+msgid "_Namespace"
+msgstr ""
+
+#: src/interface.c:682
+msgid "_Directory"
+msgstr ""
+
+#: src/interface.c:687 src/interface.c:712
+msgid "_Collection"
+msgstr ""
+
+#: src/interface.c:692
+msgid "_Advertisement"
+msgstr ""
+
+#: src/interface.c:697
+msgid "_delete"
+msgstr ""
+
+#: src/interface.c:710
+msgid ""
+"Will prevent future insertions into the namespace (will not delete content "
+"in the namespace)"
+msgstr ""
+
+#: src/interface.c:716
+msgid "end collection (will not delete content already in the collection)"
+msgstr ""
+
+#: src/interface.c:723
+msgid "label62"
+msgstr ""
+
+#: src/interface.c:728
+msgid "label39"
+msgstr ""
+
+#: src/interface.c:764
+msgid "Content"
+msgstr ""
+
+#: src/interface.c:769
+msgid "_Advanced"
+msgstr ""
+
+#: src/interface.c:775
+msgid "_File sharing"
+msgstr ""
+
+#: src/interface.c:786
+msgid "label68"
+msgstr ""
+
+#: src/interface.c:791
+msgid "_Statistics"
+msgstr ""
+
+#: src/interface.c:807
+msgid "label72"
+msgstr ""
+
+#: src/interface.c:812
+msgid "label38"
+msgstr ""
+
+#: src/interface.c:825 src/interface.c:1645
+msgid "/join #gnunet"
+msgstr ""
+
+#: src/interface.c:837
+msgid "_Chat"
+msgstr ""
+
+#: src/interface.c:888
+msgid "Splash Screen"
+msgstr ""
+
+#: src/interface.c:891
+msgid "status"
+msgstr ""
+
+#: src/interface.c:892
+msgid "gnunetd status"
+msgstr ""
+
+#: src/interface.c:895
+msgid "Enter the keywords to search for in this line."
+msgstr ""
+
+#: src/interface.c:1065 src/interface.c:1310
+msgid "File Information"
+msgstr ""
+
+#: src/interface.c:1078
+msgid "Please provide meta-data and keywords for the content."
+msgstr ""
+
+#: src/interface.c:1090
+msgid "_Type:"
+msgstr ""
+
+#: src/interface.c:1104
+msgid "unknown"
+msgstr ""
+
+#: src/interface.c:1111
+msgid "_Value:"
+msgstr ""
+
+#: src/interface.c:1145 src/interface.c:1342
+msgid "Meta-data"
+msgstr ""
+
+#: src/interface.c:1155
+msgid "_Keyword:"
+msgstr ""
+
+#: src/interface.c:1187
+msgid "Select entries and use Delete button in order to delete keywords."
+msgstr ""
+
+#: src/interface.c:1191
+msgid "Keywords"
+msgstr ""
+
+#: src/interface.c:1207
+msgid "Use this button to delete meta-data or keywords."
+msgstr ""
+
+#: src/interface.c:1245
+msgid "This dialog is used to edit information about shared files."
+msgstr ""
+
+#: src/interface.c:1248
+msgid "Value Entry"
+msgstr ""
+
+#: src/interface.c:1249
+msgid ""
+"Enter the value for the meta-data of the specified type here.\n"
+"Press ENTER to add the data."
+msgstr ""
+
+#: src/interface.c:1252
+msgid "Lists all of the keywords that will be used."
+msgstr ""
+
+#: src/interface.c:1255
+msgid "Delete button"
+msgstr ""
+
+#: src/interface.c:1258
+msgid "metaDataDialogCancelButton"
+msgstr ""
+
+#: src/interface.c:1259
+msgid "Abort the upload operation."
+msgstr ""
+
+#: src/interface.c:1486
+msgid "Namespace Contents"
+msgstr ""
+
+#: src/interface.c:1557
+msgid "_Update"
+msgstr ""
+
+#: src/interface.c:1612
+msgid "Chat"
+msgstr ""
+
+#: src/interface.c:1670
+msgid "Senden"
+msgstr ""
+
+#: src/support.c:90 src/support.c:114
+#, c-format
+msgid "Couldn't find pixmap file: %s"
+msgstr ""

Added: gnunet-gtk/po/insert-header.sin
===================================================================
--- gnunet-gtk/po/insert-header.sin     2005-05-24 11:18:12 UTC (rev 806)
+++ gnunet-gtk/po/insert-header.sin     2005-05-24 11:20:25 UTC (rev 807)
@@ -0,0 +1 @@
+link /usr/share/gettext/po/insert-header.sin
\ No newline at end of file


Property changes on: gnunet-gtk/po/insert-header.sin
___________________________________________________________________
Name: svn:special
   + *

Added: gnunet-gtk/po/stamp-po
===================================================================
--- gnunet-gtk/po/stamp-po      2005-05-24 11:18:12 UTC (rev 806)
+++ gnunet-gtk/po/stamp-po      2005-05-24 11:20:25 UTC (rev 807)
@@ -0,0 +1 @@
+timestamp

Modified: gnunet-gtk/src/Makefile.am
===================================================================
--- gnunet-gtk/src/Makefile.am  2005-05-24 11:18:12 UTC (rev 806)
+++ gnunet-gtk/src/Makefile.am  2005-05-24 11:20:25 UTC (rev 807)
@@ -7,7 +7,7 @@
 bin_PROGRAMS = gnunet-gtk
 
 gnunet_gtk_SOURCES = \
-       main.c \
+       main.c gettext.h \
        support.c support.h \
        interface.c interface.h \
        callbacks.c callbacks.h

Modified: gnunet-gtk/src/callbacks.c
===================================================================
--- gnunet-gtk/src/callbacks.c  2005-05-24 11:18:12 UTC (rev 806)
+++ gnunet-gtk/src/callbacks.c  2005-05-24 11:20:25 UTC (rev 807)
@@ -0,0 +1,237 @@
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
+#include <gtk/gtk.h>
+
+#include "callbacks.h"
+#include "interface.h"
+#include "support.h"
+
+
+void
+on_about_activate                      (GtkMenuItem     *menuitem,
+                                        gpointer         user_data)
+{
+
+}
+
+
+void
+on_startGnunetdButton_clicked          (GtkButton       *button,
+                                        gpointer         user_data)
+{
+
+}
+
+
+void
+on_stopDaemon_clicked                  (GtkButton       *button,
+                                        gpointer         user_data)
+{
+
+}
+
+
+void
+on_fssearchbutton_clicked              (GtkButton       *button,
+                                        gpointer         user_data)
+{
+
+}
+
+
+void
+on_mainFileSharingInsertBrowseButton_activate
+                                        (GtkButton       *button,
+                                        gpointer         user_data)
+{
+
+}
+
+
+void
+on_fsinsertuploadbutton_clicked        (GtkButton       *button,
+                                        gpointer         user_data)
+{
+
+}
+
+
+void
+on_create_namespace_activate           (GtkMenuItem     *menuitem,
+                                        gpointer         user_data)
+{
+
+}
+
+
+void
+on_create_directory_activate           (GtkMenuItem     *menuitem,
+                                        gpointer         user_data)
+{
+
+}
+
+
+void
+on_create_collection_activate          (GtkMenuItem     *menuitem,
+                                        gpointer         user_data)
+{
+
+}
+
+
+void
+on_create_advertisement_activate       (GtkMenuItem     *menuitem,
+                                        gpointer         user_data)
+{
+
+}
+
+
+void
+on_namespace2_activate                 (GtkMenuItem     *menuitem,
+                                        gpointer         user_data)
+{
+
+}
+
+
+void
+on_collection_delete_activate          (GtkMenuItem     *menuitem,
+                                        gpointer         user_data)
+{
+
+}
+
+
+void
+chatMainEntryLine_activate             (GtkEntry        *entry,
+                                        gpointer         user_data)
+{
+
+}
+
+
+void
+on_chatMainEntryLine_editing_done      (GtkCellEditable *celleditable,
+                                        gpointer         user_data)
+{
+
+}
+
+
+void
+on_metaDataDialog_close                (GtkDialog       *dialog,
+                                        gpointer         user_data)
+{
+
+}
+
+
+void
+on_metaDataDialogValueEntry_editing_done
+                                        (GtkCellEditable *celleditable,
+                                        gpointer         user_data)
+{
+
+}
+
+
+gboolean
+on_metaDataDialogMetaDataList_select_cursor_row
+                                        (GtkTreeView     *treeview,
+                                        gboolean         start_editing,
+                                        gpointer         user_data)
+{
+
+  return FALSE;
+}
+
+
+void
+fileInformationKeywordEntry_activate   (GtkEntry        *entry,
+                                        gpointer         user_data)
+{
+
+}
+
+
+gboolean
+on_metaDataDialogKeywordList_select_cursor_row
+                                        (GtkTreeView     *treeview,
+                                        gboolean         start_editing,
+                                        gpointer         user_data)
+{
+
+  return FALSE;
+}
+
+
+void
+on_metaDataDialogDeleteButton_activate (GtkButton       *button,
+                                        gpointer         user_data)
+{
+
+}
+
+
+void
+on_metaDataDialogApplyButton_clicked   (GtkButton       *button,
+                                        gpointer         user_data)
+{
+
+}
+
+
+void
+on_downloadButton_clicked              (GtkButton       *button,
+                                        gpointer         user_data)
+{
+
+}
+
+
+gboolean
+on_namespaceContentFrameTreeView_select_cursor_row
+                                        (GtkTreeView     *treeview,
+                                        gboolean         start_editing,
+                                        gpointer         user_data)
+{
+
+  return FALSE;
+}
+
+
+void
+on_namespaceInsertButton_activate      (GtkButton       *button,
+                                        gpointer         user_data)
+{
+
+}
+
+
+void
+on_namespaceUpdateButton_clicked       (GtkButton       *button,
+                                        gpointer         user_data)
+{
+
+}
+
+
+void
+on_chatLineTextEntry_editing_done      (GtkCellEditable *celleditable,
+                                        gpointer         user_data)
+{
+
+}
+
+
+void
+on_chatSendButton_clicked              (GtkButton       *button,
+                                        gpointer         user_data)
+{
+
+}
+

Modified: gnunet-gtk/src/callbacks.h
===================================================================
--- gnunet-gtk/src/callbacks.h  2005-05-24 11:18:12 UTC (rev 806)
+++ gnunet-gtk/src/callbacks.h  2005-05-24 11:20:25 UTC (rev 807)
@@ -0,0 +1,118 @@
+#include <gtk/gtk.h>
+
+
+void
+on_about_activate                      (GtkMenuItem     *menuitem,
+                                        gpointer         user_data);
+
+void
+on_startGnunetdButton_clicked          (GtkButton       *button,
+                                        gpointer         user_data);
+
+void
+on_stopDaemon_clicked                  (GtkButton       *button,
+                                        gpointer         user_data);
+
+void
+on_fssearchbutton_clicked              (GtkButton       *button,
+                                        gpointer         user_data);
+
+void
+on_mainFileSharingInsertBrowseButton_activate
+                                        (GtkButton       *button,
+                                        gpointer         user_data);
+
+void
+on_fsinsertuploadbutton_clicked        (GtkButton       *button,
+                                        gpointer         user_data);
+
+void
+on_create_namespace_activate           (GtkMenuItem     *menuitem,
+                                        gpointer         user_data);
+
+void
+on_create_directory_activate           (GtkMenuItem     *menuitem,
+                                        gpointer         user_data);
+
+void
+on_create_collection_activate          (GtkMenuItem     *menuitem,
+                                        gpointer         user_data);
+
+void
+on_create_advertisement_activate       (GtkMenuItem     *menuitem,
+                                        gpointer         user_data);
+
+void
+on_namespace2_activate                 (GtkMenuItem     *menuitem,
+                                        gpointer         user_data);
+
+void
+on_collection_delete_activate          (GtkMenuItem     *menuitem,
+                                        gpointer         user_data);
+
+void
+chatMainEntryLine_activate             (GtkEntry        *entry,
+                                        gpointer         user_data);
+
+void
+on_chatMainEntryLine_editing_done      (GtkCellEditable *celleditable,
+                                        gpointer         user_data);
+
+void
+on_metaDataDialog_close                (GtkDialog       *dialog,
+                                        gpointer         user_data);
+
+void
+on_metaDataDialogValueEntry_editing_done
+                                        (GtkCellEditable *celleditable,
+                                        gpointer         user_data);
+
+gboolean
+on_metaDataDialogMetaDataList_select_cursor_row
+                                        (GtkTreeView     *treeview,
+                                        gboolean         start_editing,
+                                        gpointer         user_data);
+
+void
+fileInformationKeywordEntry_activate   (GtkEntry        *entry,
+                                        gpointer         user_data);
+
+gboolean
+on_metaDataDialogKeywordList_select_cursor_row
+                                        (GtkTreeView     *treeview,
+                                        gboolean         start_editing,
+                                        gpointer         user_data);
+
+void
+on_metaDataDialogDeleteButton_activate (GtkButton       *button,
+                                        gpointer         user_data);
+
+void
+on_metaDataDialogApplyButton_clicked   (GtkButton       *button,
+                                        gpointer         user_data);
+
+void
+on_downloadButton_clicked              (GtkButton       *button,
+                                        gpointer         user_data);
+
+gboolean
+on_namespaceContentFrameTreeView_select_cursor_row
+                                        (GtkTreeView     *treeview,
+                                        gboolean         start_editing,
+                                        gpointer         user_data);
+
+void
+on_namespaceInsertButton_activate      (GtkButton       *button,
+                                        gpointer         user_data);
+
+void
+on_namespaceUpdateButton_clicked       (GtkButton       *button,
+                                        gpointer         user_data);
+
+void
+on_chatLineTextEntry_editing_done      (GtkCellEditable *celleditable,
+                                        gpointer         user_data);
+
+void
+on_chatSendButton_clicked              (GtkButton       *button,
+                                        gpointer         user_data);

Added: gnunet-gtk/src/gettext.h
===================================================================
--- gnunet-gtk/src/gettext.h    2005-05-24 11:18:12 UTC (rev 806)
+++ gnunet-gtk/src/gettext.h    2005-05-24 11:20:25 UTC (rev 807)
@@ -0,0 +1,71 @@
+/* Convenience header for conditional use of GNU <libintl.h>.
+   Copyright (C) 1995-1998, 2000-2002 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   USA.  */
+
+#ifndef _LIBGETTEXT_H
+#define _LIBGETTEXT_H 1
+
+/* NLS can be disabled through the configure --disable-nls option.  */
+#if ENABLE_NLS
+
+/* Get declarations of GNU message catalog functions.  */
+# include <libintl.h>
+
+#else
+
+/* Solaris /usr/include/locale.h includes /usr/include/libintl.h, which
+   chokes if dcgettext is defined as a macro.  So include it now, to make
+   later inclusions of <locale.h> a NOP.  We don't include <libintl.h>
+   as well because people using "gettext.h" will not include <libintl.h>,
+   and also including <libintl.h> would fail on SunOS 4, whereas <locale.h>
+   is OK.  */
+#if defined(__sun)
+# include <locale.h>
+#endif
+
+/* Disabled NLS.
+   The casts to 'const char *' serve the purpose of producing warnings
+   for invalid uses of the value returned from these functions.
+   On pre-ANSI systems without 'const', the config.h file is supposed to
+   contain "#define const".  */
+# define gettext(Msgid) ((const char *) (Msgid))
+# define dgettext(Domainname, Msgid) ((const char *) (Msgid))
+# define dcgettext(Domainname, Msgid, Category) ((const char *) (Msgid))
+# define ngettext(Msgid1, Msgid2, N) \
+    ((N) == 1 ? (const char *) (Msgid1) : (const char *) (Msgid2))
+# define dngettext(Domainname, Msgid1, Msgid2, N) \
+    ((N) == 1 ? (const char *) (Msgid1) : (const char *) (Msgid2))
+# define dcngettext(Domainname, Msgid1, Msgid2, N, Category) \
+    ((N) == 1 ? (const char *) (Msgid1) : (const char *) (Msgid2))
+/* slight modification here to avoid warnings: generate NO code,
+   not even the cast... */
+# define textdomain(Domainname)
+# define bindtextdomain(Domainname, Dirname)
+# define bind_textdomain_codeset(Domainname, Codeset) ((const char *) 
(Codeset))
+
+#endif
+
+/* A pseudo function call that serves as a marker for the automated
+   extraction of messages, but does not call gettext().  The run-time
+   translation is done at a different place in the code.
+   The argument, String, should be a literal string.  Concatenated strings
+   and other string expressions won't work.
+   The macro's expansion is not parenthesized, so that it is suitable as
+   initializer for static 'char[]' or 'const char[]' variables.  */
+#define gettext_noop(String) String
+
+#endif /* _LIBGETTEXT_H */

Modified: gnunet-gtk/src/interface.c
===================================================================
--- gnunet-gtk/src/interface.c  2005-05-24 11:18:12 UTC (rev 806)
+++ gnunet-gtk/src/interface.c  2005-05-24 11:20:25 UTC (rev 807)
@@ -30,21 +30,25 @@
 create_mainWindow (void)
 {
   GtkWidget *mainWindow;
+  GdkPixbuf *mainWindow_icon_pixbuf;
   GtkWidget *vbox1;
-  GtkWidget *menubar1;
+  GtkWidget *main_app_menubar;
   GtkWidget *quit1;
   GtkWidget *help1;
   GtkWidget *help1_menu;
   GtkWidget *about;
   GtkWidget *mainnotebook;
-  GtkWidget *scrolledwindow1;
+  GtkWidget *splashScreen;
+  GtkWidget *welcomelabel;
+  AtkObject *atko;
+  GtkWidget *fs_scrolledwindow;
   GtkWidget *viewport1;
   GtkWidget *scrolledwindow2;
   GtkWidget *viewport2;
   GtkWidget *vbox2;
   GtkWidget *frame3;
   GtkWidget *hbox2;
-  GtkWidget *button10;
+  GtkWidget *startGnunetdButton;
   GtkWidget *alignment1;
   GtkWidget *hbox11;
   GtkWidget *image1;
@@ -55,8 +59,7 @@
   GtkWidget *image2;
   GtkWidget *label64;
   GtkWidget *statusPixmap;
-  AtkObject *atko;
-  GtkWidget *label1;
+  GtkWidget *gnunetdControlLabel;
   GtkWidget *frame2;
   GtkWidget *statisticsLabel;
   GtkWidget *label2;
@@ -64,9 +67,9 @@
   GtkWidget *scrolledwindow5;
   GtkWidget *clist2;
   GtkWidget *label3;
-  GtkWidget *label1;
+  GtkWidget *generalLabel;
   GtkWidget *fsnotebook;
-  GtkWidget *vbox5;
+  GtkWidget *fsstatusvbox;
   GtkWidget *frame8;
   GtkWidget *scrolledwindow9;
   GtkWidget *clist7;
@@ -80,37 +83,52 @@
   GtkWidget *clist6;
   GtkWidget *label46;
   GtkWidget *statusfstab;
-  GtkWidget *vbox7;
+  GtkWidget *fsdownloadvbox;
   GtkWidget *notebook6;
   GtkWidget *label61;
   GtkWidget *label36;
-  GtkWidget *hbox4;
-  GtkWidget *combo2;
-  GList *combo2_items = NULL;
+  GtkWidget *fssearchhbox;
+  GtkWidget *fsSearchStringInputLine;
+  GList *fsSearchStringInputLine_items = NULL;
   GtkWidget *combo_entry2;
   GtkWidget *fssearchbutton;
+  GtkWidget *alignment8;
+  GtkWidget *hbox21;
+  GtkWidget *image8;
+  GtkWidget *label71;
   GtkWidget *label40;
   GtkWidget *optionmenu1;
   GtkWidget *convertwidget16;
   GtkWidget *convertwidget17;
   GtkWidget *downloadfstab;
-  GtkWidget *vbox9;
+  GtkWidget *fsinsertvbox;
   GtkWidget *hbox8;
+  GtkWidget *methodLabel;
   GtkWidget *indexbutton;
   GSList *indexbutton_group = NULL;
   GtkWidget *insertButton;
   GtkWidget *hbox9;
+  GtkWidget *scopeLabel;
   GtkWidget *radiobutton2;
   GSList *radiobutton2_group = NULL;
   GtkWidget *radiobutton3;
   GtkWidget *hbox10;
   GtkWidget *label54;
-  GtkWidget *combo1;
-  GList *combo1_items = NULL;
+  GtkWidget *fsinsertfilenamecombo;
+  GList *fsinsertfilenamecombo_items = NULL;
   GtkWidget *combo_entry1;
-  GtkWidget *button9;
+  GtkWidget *mainFileSharingInsertBrowseButton;
+  GtkWidget *alignment7;
+  GtkWidget *hbox20;
+  GtkWidget *image7;
+  GtkWidget *label70;
+  GtkWidget *fsinsertuploadbutton;
+  GtkWidget *alignment9;
+  GtkWidget *hbox22;
+  GtkWidget *image9;
+  GtkWidget *label74;
   GtkWidget *insertfstab;
-  GtkWidget *vbox6;
+  GtkWidget *fsadvancedvbox;
   GtkWidget *menubar2;
   GtkWidget *createNamespace;
   GtkWidget *createNamespace_menu;
@@ -133,19 +151,17 @@
   GtkWidget *label55;
   GtkWidget *advancedfstab;
   GtkWidget *fstab;
-  GtkWidget *vbox3;
+  GtkWidget *statisticsnotebookvbox;
   GtkWidget *label68;
   GtkWidget *label5;
-  GtkWidget *vbox4;
+  GtkWidget *chatnotbookvbox;
   GtkWidget *notebook3;
-  GtkWidget *scrolledwindow13;
-  GtkWidget *viewport4;
-  GtkWidget *label59;
+  GtkWidget *label72;
   GtkWidget *label38;
   GtkWidget *combo3;
   GList *combo3_items = NULL;
-  GtkWidget *combo_entry3;
-  GtkWidget *label6;
+  GtkWidget *chatMainEntryLine;
+  GtkWidget *chatNotebookLabel;
   GtkWidget *statusbar;
   GtkAccelGroup *accel_group;
   GtkTooltips *tooltips;
@@ -155,139 +171,186 @@
   accel_group = gtk_accel_group_new ();
 
   mainWindow = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  gtk_widget_set_name (mainWindow, "mainWindow");
   gtk_window_set_title (GTK_WINDOW (mainWindow), _("gnunet-gtk"));
+  mainWindow_icon_pixbuf = create_pixbuf ("gnunet_logo.png");
+  if (mainWindow_icon_pixbuf)
+    {
+      gtk_window_set_icon (GTK_WINDOW (mainWindow), mainWindow_icon_pixbuf);
+      gdk_pixbuf_unref (mainWindow_icon_pixbuf);
+    }
 
   vbox1 = gtk_vbox_new (FALSE, 0);
+  gtk_widget_set_name (vbox1, "vbox1");
   gtk_widget_show (vbox1);
   gtk_container_add (GTK_CONTAINER (mainWindow), vbox1);
 
-  menubar1 = gtk_menu_bar_new ();
-  gtk_widget_show (menubar1);
-  gtk_box_pack_start (GTK_BOX (vbox1), menubar1, FALSE, FALSE, 0);
+  main_app_menubar = gtk_menu_bar_new ();
+  gtk_widget_set_name (main_app_menubar, "main_app_menubar");
+  gtk_widget_show (main_app_menubar);
+  gtk_box_pack_start (GTK_BOX (vbox1), main_app_menubar, FALSE, FALSE, 0);
 
-  quit1 = gtk_menu_item_new_with_mnemonic (_("_Quit"));
+  quit1 = gtk_image_menu_item_new_from_stock ("gtk-quit", accel_group);
+  gtk_widget_set_name (quit1, "quit1");
   gtk_widget_show (quit1);
-  gtk_container_add (GTK_CONTAINER (menubar1), quit1);
+  gtk_container_add (GTK_CONTAINER (main_app_menubar), quit1);
 
-  help1 = gtk_menu_item_new_with_mnemonic (_("_Help"));
+  help1 = gtk_image_menu_item_new_from_stock ("gtk-help", accel_group);
+  gtk_widget_set_name (help1, "help1");
   gtk_widget_show (help1);
-  gtk_container_add (GTK_CONTAINER (menubar1), help1);
+  gtk_container_add (GTK_CONTAINER (main_app_menubar), help1);
 
   help1_menu = gtk_menu_new ();
+  gtk_widget_set_name (help1_menu, "help1_menu");
   gtk_menu_item_set_submenu (GTK_MENU_ITEM (help1), help1_menu);
 
-  about = gtk_menu_item_new_with_mnemonic (_("_About"));
+  about = gtk_image_menu_item_new_from_stock ("gtk-about", accel_group);
+  gtk_widget_set_name (about, "about");
   gtk_widget_show (about);
   gtk_container_add (GTK_CONTAINER (help1_menu), about);
-  gtk_widget_add_accelerator (about, "activate", accel_group,
-                              GDK_F1, 0,
-                              GTK_ACCEL_VISIBLE);
 
   mainnotebook = gtk_notebook_new ();
+  gtk_widget_set_name (mainnotebook, "mainnotebook");
   gtk_widget_show (mainnotebook);
   gtk_box_pack_start (GTK_BOX (vbox1), mainnotebook, TRUE, TRUE, 0);
   gtk_notebook_set_scrollable (GTK_NOTEBOOK (mainnotebook), TRUE);
 
-  scrolledwindow1 = gtk_scrolled_window_new (NULL, NULL);
-  gtk_widget_show (scrolledwindow1);
-  gtk_container_add (GTK_CONTAINER (mainnotebook), scrolledwindow1);
-  GTK_WIDGET_UNSET_FLAGS (scrolledwindow1, GTK_CAN_FOCUS);
-  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow1), 
GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+  splashScreen = gtk_label_new (_("Welcome to GNUnet\n"));
+  gtk_widget_set_name (splashScreen, "splashScreen");
+  gtk_widget_show (splashScreen);
+  gtk_container_add (GTK_CONTAINER (mainnotebook), splashScreen);
+  gtk_label_set_use_markup (GTK_LABEL (splashScreen), TRUE);
+  gtk_label_set_line_wrap (GTK_LABEL (splashScreen), TRUE);
 
+  welcomelabel = gtk_label_new_with_mnemonic (_("_Welcome"));
+  gtk_widget_set_name (welcomelabel, "welcomelabel");
+  gtk_widget_show (welcomelabel);
+  gtk_notebook_set_tab_label (GTK_NOTEBOOK (mainnotebook), 
gtk_notebook_get_nth_page (GTK_NOTEBOOK (mainnotebook), 0), welcomelabel);
+
+  fs_scrolledwindow = gtk_scrolled_window_new (NULL, NULL);
+  gtk_widget_set_name (fs_scrolledwindow, "fs_scrolledwindow");
+  gtk_widget_show (fs_scrolledwindow);
+  gtk_container_add (GTK_CONTAINER (mainnotebook), fs_scrolledwindow);
+  GTK_WIDGET_UNSET_FLAGS (fs_scrolledwindow, GTK_CAN_FOCUS);
+  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (fs_scrolledwindow), 
GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+
   viewport1 = gtk_viewport_new (NULL, NULL);
+  gtk_widget_set_name (viewport1, "viewport1");
   gtk_widget_show (viewport1);
-  gtk_container_add (GTK_CONTAINER (scrolledwindow1), viewport1);
+  gtk_container_add (GTK_CONTAINER (fs_scrolledwindow), viewport1);
 
   scrolledwindow2 = gtk_scrolled_window_new (NULL, NULL);
+  gtk_widget_set_name (scrolledwindow2, "scrolledwindow2");
   gtk_widget_show (scrolledwindow2);
   gtk_container_add (GTK_CONTAINER (viewport1), scrolledwindow2);
   GTK_WIDGET_UNSET_FLAGS (scrolledwindow2, GTK_CAN_FOCUS);
   gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow2), 
GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
 
   viewport2 = gtk_viewport_new (NULL, NULL);
+  gtk_widget_set_name (viewport2, "viewport2");
   gtk_widget_show (viewport2);
   gtk_container_add (GTK_CONTAINER (scrolledwindow2), viewport2);
 
   vbox2 = gtk_vbox_new (FALSE, 0);
+  gtk_widget_set_name (vbox2, "vbox2");
   gtk_widget_show (vbox2);
   gtk_container_add (GTK_CONTAINER (viewport2), vbox2);
 
   frame3 = gtk_frame_new (NULL);
+  gtk_widget_set_name (frame3, "frame3");
   gtk_widget_show (frame3);
   gtk_box_pack_start (GTK_BOX (vbox2), frame3, FALSE, FALSE, 0);
 
   hbox2 = gtk_hbox_new (FALSE, 0);
+  gtk_widget_set_name (hbox2, "hbox2");
   gtk_widget_show (hbox2);
   gtk_container_add (GTK_CONTAINER (frame3), hbox2);
 
-  button10 = gtk_button_new ();
-  gtk_widget_show (button10);
-  gtk_box_pack_start (GTK_BOX (hbox2), button10, TRUE, TRUE, 0);
+  startGnunetdButton = gtk_button_new ();
+  gtk_widget_set_name (startGnunetdButton, "startGnunetdButton");
+  gtk_widget_show (startGnunetdButton);
+  gtk_box_pack_start (GTK_BOX (hbox2), startGnunetdButton, TRUE, TRUE, 0);
 
   alignment1 = gtk_alignment_new (0.5, 0.5, 0, 0);
+  gtk_widget_set_name (alignment1, "alignment1");
   gtk_widget_show (alignment1);
-  gtk_container_add (GTK_CONTAINER (button10), alignment1);
+  gtk_container_add (GTK_CONTAINER (startGnunetdButton), alignment1);
 
   hbox11 = gtk_hbox_new (FALSE, 2);
+  gtk_widget_set_name (hbox11, "hbox11");
   gtk_widget_show (hbox11);
   gtk_container_add (GTK_CONTAINER (alignment1), hbox11);
 
   image1 = gtk_image_new_from_stock ("gtk-media-play", GTK_ICON_SIZE_BUTTON);
+  gtk_widget_set_name (image1, "image1");
   gtk_widget_show (image1);
   gtk_box_pack_start (GTK_BOX (hbox11), image1, FALSE, FALSE, 0);
 
   startButton = gtk_label_new_with_mnemonic (_("_start gnunetd"));
+  gtk_widget_set_name (startButton, "startButton");
   gtk_widget_show (startButton);
   gtk_box_pack_start (GTK_BOX (hbox11), startButton, TRUE, TRUE, 0);
   gtk_label_set_justify (GTK_LABEL (startButton), GTK_JUSTIFY_RIGHT);
 
   stopDaemon = gtk_button_new ();
+  gtk_widget_set_name (stopDaemon, "stopDaemon");
   gtk_widget_show (stopDaemon);
   gtk_box_pack_start (GTK_BOX (hbox2), stopDaemon, TRUE, TRUE, 0);
   gtk_tooltips_set_tip (tooltips, stopDaemon, _("disconnect from GNUnet"), 
NULL);
 
   alignment2 = gtk_alignment_new (0.5, 0.5, 0, 0);
+  gtk_widget_set_name (alignment2, "alignment2");
   gtk_widget_show (alignment2);
   gtk_container_add (GTK_CONTAINER (stopDaemon), alignment2);
 
   hbox12 = gtk_hbox_new (FALSE, 2);
+  gtk_widget_set_name (hbox12, "hbox12");
   gtk_widget_show (hbox12);
   gtk_container_add (GTK_CONTAINER (alignment2), hbox12);
 
   image2 = gtk_image_new_from_stock ("gtk-stop", GTK_ICON_SIZE_BUTTON);
+  gtk_widget_set_name (image2, "image2");
   gtk_widget_show (image2);
   gtk_box_pack_start (GTK_BOX (hbox12), image2, FALSE, FALSE, 0);
 
   label64 = gtk_label_new_with_mnemonic (_("s_top gnunetd"));
+  gtk_widget_set_name (label64, "label64");
   gtk_widget_show (label64);
   gtk_box_pack_start (GTK_BOX (hbox12), label64, FALSE, FALSE, 0);
 
   statusPixmap = gtk_image_new_from_stock ("gtk-no", GTK_ICON_SIZE_BUTTON);
+  gtk_widget_set_name (statusPixmap, "statusPixmap");
   gtk_widget_show (statusPixmap);
   gtk_box_pack_start (GTK_BOX (hbox2), statusPixmap, FALSE, FALSE, 0);
 
-  label1 = gtk_label_new (_("gnunetd control"));
-  gtk_widget_show (label1);
-  gtk_frame_set_label_widget (GTK_FRAME (frame3), label1);
+  gnunetdControlLabel = gtk_label_new (_("gnunetd control"));
+  gtk_widget_set_name (gnunetdControlLabel, "gnunetdControlLabel");
+  gtk_widget_show (gnunetdControlLabel);
+  gtk_frame_set_label_widget (GTK_FRAME (frame3), gnunetdControlLabel);
 
   frame2 = gtk_frame_new (NULL);
+  gtk_widget_set_name (frame2, "frame2");
   gtk_widget_show (frame2);
   gtk_box_pack_start (GTK_BOX (vbox2), frame2, TRUE, TRUE, 0);
 
   statisticsLabel = gtk_label_new (_("Unavailable.\n"));
+  gtk_widget_set_name (statisticsLabel, "statisticsLabel");
   gtk_widget_show (statisticsLabel);
   gtk_container_add (GTK_CONTAINER (frame2), statisticsLabel);
   gtk_label_set_line_wrap (GTK_LABEL (statisticsLabel), TRUE);
 
   label2 = gtk_label_new (_("Statistics"));
+  gtk_widget_set_name (label2, "label2");
   gtk_widget_show (label2);
   gtk_frame_set_label_widget (GTK_FRAME (frame2), label2);
 
   frame1 = gtk_frame_new (NULL);
+  gtk_widget_set_name (frame1, "frame1");
   gtk_widget_show (frame1);
   gtk_box_pack_start (GTK_BOX (vbox2), frame1, TRUE, TRUE, 0);
 
   scrolledwindow5 = gtk_scrolled_window_new (NULL, NULL);
+  gtk_widget_set_name (scrolledwindow5, "scrolledwindow5");
   gtk_widget_show (scrolledwindow5);
   gtk_container_add (GTK_CONTAINER (frame1), scrolledwindow5);
   GTK_WIDGET_UNSET_FLAGS (scrolledwindow5, GTK_CAN_FOCUS);
@@ -295,31 +358,38 @@
   gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolledwindow5), 
GTK_SHADOW_IN);
 
   clist2 = gtk_tree_view_new ();
+  gtk_widget_set_name (clist2, "clist2");
   gtk_widget_show (clist2);
   gtk_container_add (GTK_CONTAINER (scrolledwindow5), clist2);
 
   label3 = gtk_label_new (_("Available Applications"));
+  gtk_widget_set_name (label3, "label3");
   gtk_widget_show (label3);
   gtk_frame_set_label_widget (GTK_FRAME (frame1), label3);
 
-  label1 = gtk_label_new_with_mnemonic (_("_General"));
-  gtk_widget_show (label1);
-  gtk_notebook_set_tab_label (GTK_NOTEBOOK (mainnotebook), 
gtk_notebook_get_nth_page (GTK_NOTEBOOK (mainnotebook), 0), label1);
-  gtk_label_set_justify (GTK_LABEL (label1), GTK_JUSTIFY_CENTER);
+  generalLabel = gtk_label_new_with_mnemonic (_("_General"));
+  gtk_widget_set_name (generalLabel, "generalLabel");
+  gtk_widget_show (generalLabel);
+  gtk_notebook_set_tab_label (GTK_NOTEBOOK (mainnotebook), 
gtk_notebook_get_nth_page (GTK_NOTEBOOK (mainnotebook), 1), generalLabel);
+  gtk_label_set_justify (GTK_LABEL (generalLabel), GTK_JUSTIFY_CENTER);
 
   fsnotebook = gtk_notebook_new ();
+  gtk_widget_set_name (fsnotebook, "fsnotebook");
   gtk_widget_show (fsnotebook);
   gtk_container_add (GTK_CONTAINER (mainnotebook), fsnotebook);
 
-  vbox5 = gtk_vbox_new (FALSE, 0);
-  gtk_widget_show (vbox5);
-  gtk_container_add (GTK_CONTAINER (fsnotebook), vbox5);
+  fsstatusvbox = gtk_vbox_new (FALSE, 0);
+  gtk_widget_set_name (fsstatusvbox, "fsstatusvbox");
+  gtk_widget_show (fsstatusvbox);
+  gtk_container_add (GTK_CONTAINER (fsnotebook), fsstatusvbox);
 
   frame8 = gtk_frame_new (NULL);
+  gtk_widget_set_name (frame8, "frame8");
   gtk_widget_show (frame8);
-  gtk_box_pack_start (GTK_BOX (vbox5), frame8, TRUE, TRUE, 0);
+  gtk_box_pack_start (GTK_BOX (fsstatusvbox), frame8, TRUE, TRUE, 0);
 
   scrolledwindow9 = gtk_scrolled_window_new (NULL, NULL);
+  gtk_widget_set_name (scrolledwindow9, "scrolledwindow9");
   gtk_widget_show (scrolledwindow9);
   gtk_container_add (GTK_CONTAINER (frame8), scrolledwindow9);
   GTK_WIDGET_UNSET_FLAGS (scrolledwindow9, GTK_CAN_FOCUS);
@@ -327,18 +397,22 @@
   gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolledwindow9), 
GTK_SHADOW_IN);
 
   clist7 = gtk_tree_view_new ();
+  gtk_widget_set_name (clist7, "clist7");
   gtk_widget_show (clist7);
   gtk_container_add (GTK_CONTAINER (scrolledwindow9), clist7);
 
   label16 = gtk_label_new (_("Search Results"));
+  gtk_widget_set_name (label16, "label16");
   gtk_widget_show (label16);
   gtk_frame_set_label_widget (GTK_FRAME (frame8), label16);
 
   frame9 = gtk_frame_new (NULL);
+  gtk_widget_set_name (frame9, "frame9");
   gtk_widget_show (frame9);
-  gtk_box_pack_start (GTK_BOX (vbox5), frame9, TRUE, TRUE, 0);
+  gtk_box_pack_start (GTK_BOX (fsstatusvbox), frame9, TRUE, TRUE, 0);
 
   scrolledwindow7 = gtk_scrolled_window_new (NULL, NULL);
+  gtk_widget_set_name (scrolledwindow7, "scrolledwindow7");
   gtk_widget_show (scrolledwindow7);
   gtk_container_add (GTK_CONTAINER (frame9), scrolledwindow7);
   GTK_WIDGET_UNSET_FLAGS (scrolledwindow7, GTK_CAN_FOCUS);
@@ -346,18 +420,22 @@
   gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolledwindow7), 
GTK_SHADOW_IN);
 
   clist5 = gtk_tree_view_new ();
+  gtk_widget_set_name (clist5, "clist5");
   gtk_widget_show (clist5);
   gtk_container_add (GTK_CONTAINER (scrolledwindow7), clist5);
 
   label45 = gtk_label_new (_("Downloads"));
+  gtk_widget_set_name (label45, "label45");
   gtk_widget_show (label45);
   gtk_frame_set_label_widget (GTK_FRAME (frame9), label45);
 
   frame10 = gtk_frame_new (NULL);
+  gtk_widget_set_name (frame10, "frame10");
   gtk_widget_show (frame10);
-  gtk_box_pack_start (GTK_BOX (vbox5), frame10, TRUE, TRUE, 0);
+  gtk_box_pack_start (GTK_BOX (fsstatusvbox), frame10, TRUE, TRUE, 0);
 
   scrolledwindow8 = gtk_scrolled_window_new (NULL, NULL);
+  gtk_widget_set_name (scrolledwindow8, "scrolledwindow8");
   gtk_widget_show (scrolledwindow8);
   gtk_container_add (GTK_CONTAINER (frame10), scrolledwindow8);
   GTK_WIDGET_UNSET_FLAGS (scrolledwindow8, GTK_CAN_FOCUS);
@@ -365,87 +443,135 @@
   gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolledwindow8), 
GTK_SHADOW_IN);
 
   clist6 = gtk_tree_view_new ();
+  gtk_widget_set_name (clist6, "clist6");
   gtk_widget_show (clist6);
   gtk_container_add (GTK_CONTAINER (scrolledwindow8), clist6);
 
   label46 = gtk_label_new (_("Uploads"));
+  gtk_widget_set_name (label46, "label46");
   gtk_widget_show (label46);
   gtk_frame_set_label_widget (GTK_FRAME (frame10), label46);
 
   statusfstab = gtk_label_new_with_mnemonic (_("S_tatus"));
+  gtk_widget_set_name (statusfstab, "statusfstab");
   gtk_widget_show (statusfstab);
   gtk_notebook_set_tab_label (GTK_NOTEBOOK (fsnotebook), 
gtk_notebook_get_nth_page (GTK_NOTEBOOK (fsnotebook), 0), statusfstab);
   gtk_label_set_justify (GTK_LABEL (statusfstab), GTK_JUSTIFY_CENTER);
 
-  vbox7 = gtk_vbox_new (FALSE, 0);
-  gtk_widget_show (vbox7);
-  gtk_container_add (GTK_CONTAINER (fsnotebook), vbox7);
+  fsdownloadvbox = gtk_vbox_new (FALSE, 0);
+  gtk_widget_set_name (fsdownloadvbox, "fsdownloadvbox");
+  gtk_widget_show (fsdownloadvbox);
+  gtk_container_add (GTK_CONTAINER (fsnotebook), fsdownloadvbox);
 
   notebook6 = gtk_notebook_new ();
-  gtk_widget_show (notebook6);
-  gtk_box_pack_start (GTK_BOX (vbox7), notebook6, TRUE, TRUE, 0);
+  gtk_widget_set_name (notebook6, "notebook6");
+  gtk_box_pack_start (GTK_BOX (fsdownloadvbox), notebook6, TRUE, TRUE, 0);
 
   label61 = gtk_label_new (_("label61"));
-  gtk_widget_show (label61);
+  gtk_widget_set_name (label61, "label61");
   gtk_container_add (GTK_CONTAINER (notebook6), label61);
 
   label36 = gtk_label_new (_("label36"));
-  gtk_widget_show (label36);
+  gtk_widget_set_name (label36, "label36");
   gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook6), 
gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook6), 0), label36);
   gtk_label_set_justify (GTK_LABEL (label36), GTK_JUSTIFY_CENTER);
 
-  hbox4 = gtk_hbox_new (FALSE, 0);
-  gtk_widget_show (hbox4);
-  gtk_box_pack_start (GTK_BOX (vbox7), hbox4, FALSE, FALSE, 0);
+  fssearchhbox = gtk_hbox_new (FALSE, 0);
+  gtk_widget_set_name (fssearchhbox, "fssearchhbox");
+  gtk_widget_show (fssearchhbox);
+  gtk_box_pack_start (GTK_BOX (fsdownloadvbox), fssearchhbox, FALSE, FALSE, 0);
 
-  combo2 = gtk_combo_new ();
-  g_object_set_data (G_OBJECT (GTK_COMBO (combo2)->popwin),
-                     "GladeParentKey", combo2);
-  gtk_widget_show (combo2);
-  gtk_box_pack_start (GTK_BOX (hbox4), combo2, TRUE, TRUE, 0);
-  combo2_items = g_list_append (combo2_items, (gpointer) "");
-  gtk_combo_set_popdown_strings (GTK_COMBO (combo2), combo2_items);
-  g_list_free (combo2_items);
+  fsSearchStringInputLine = gtk_combo_new ();
+  g_object_set_data (G_OBJECT (GTK_COMBO (fsSearchStringInputLine)->popwin),
+                     "GladeParentKey", fsSearchStringInputLine);
+  gtk_widget_set_name (fsSearchStringInputLine, "fsSearchStringInputLine");
+  gtk_widget_show (fsSearchStringInputLine);
+  gtk_box_pack_start (GTK_BOX (fssearchhbox), fsSearchStringInputLine, TRUE, 
TRUE, 0);
+  fsSearchStringInputLine_items = g_list_append 
(fsSearchStringInputLine_items, (gpointer) "");
+  gtk_combo_set_popdown_strings (GTK_COMBO (fsSearchStringInputLine), 
fsSearchStringInputLine_items);
+  g_list_free (fsSearchStringInputLine_items);
 
-  combo_entry2 = GTK_COMBO (combo2)->entry;
+  combo_entry2 = GTK_COMBO (fsSearchStringInputLine)->entry;
+  gtk_widget_set_name (combo_entry2, "combo_entry2");
   gtk_widget_show (combo_entry2);
+  gtk_widget_add_accelerator (combo_entry2, "activate", accel_group,
+                              GDK_Return, 0,
+                              GTK_ACCEL_VISIBLE);
 
-  fssearchbutton = gtk_button_new_with_mnemonic (_("_search"));
+  fssearchbutton = gtk_button_new ();
+  gtk_widget_set_name (fssearchbutton, "fssearchbutton");
   gtk_widget_show (fssearchbutton);
-  gtk_box_pack_start (GTK_BOX (hbox4), fssearchbutton, FALSE, FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (fssearchhbox), fssearchbutton, FALSE, FALSE, 0);
+  gtk_widget_add_accelerator (fssearchbutton, "activate", accel_group,
+                              GDK_Return, 0,
+                              GTK_ACCEL_VISIBLE);
 
+  alignment8 = gtk_alignment_new (0.5, 0.5, 0, 0);
+  gtk_widget_set_name (alignment8, "alignment8");
+  gtk_widget_show (alignment8);
+  gtk_container_add (GTK_CONTAINER (fssearchbutton), alignment8);
+
+  hbox21 = gtk_hbox_new (FALSE, 2);
+  gtk_widget_set_name (hbox21, "hbox21");
+  gtk_widget_show (hbox21);
+  gtk_container_add (GTK_CONTAINER (alignment8), hbox21);
+
+  image8 = gtk_image_new_from_stock ("gtk-find", GTK_ICON_SIZE_BUTTON);
+  gtk_widget_set_name (image8, "image8");
+  gtk_widget_show (image8);
+  gtk_box_pack_start (GTK_BOX (hbox21), image8, FALSE, FALSE, 0);
+
+  label71 = gtk_label_new_with_mnemonic (_("_Search"));
+  gtk_widget_set_name (label71, "label71");
+  gtk_widget_show (label71);
+  gtk_box_pack_start (GTK_BOX (hbox21), label71, FALSE, FALSE, 0);
+
   label40 = gtk_label_new (_("in namespace"));
+  gtk_widget_set_name (label40, "label40");
   gtk_widget_show (label40);
-  gtk_box_pack_start (GTK_BOX (hbox4), label40, FALSE, FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (fssearchhbox), label40, FALSE, FALSE, 0);
   gtk_label_set_justify (GTK_LABEL (label40), GTK_JUSTIFY_CENTER);
   gtk_misc_set_padding (GTK_MISC (label40), 8, 0);
 
   optionmenu1 = gtk_option_menu_new ();
+  gtk_widget_set_name (optionmenu1, "optionmenu1");
   gtk_widget_show (optionmenu1);
-  gtk_box_pack_start (GTK_BOX (hbox4), optionmenu1, FALSE, FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (fssearchhbox), optionmenu1, FALSE, FALSE, 0);
 
   convertwidget16 = gtk_menu_new ();
+  gtk_widget_set_name (convertwidget16, "convertwidget16");
 
   convertwidget17 = gtk_menu_item_new_with_mnemonic (_("global (everywhere)"));
+  gtk_widget_set_name (convertwidget17, "convertwidget17");
   gtk_widget_show (convertwidget17);
   gtk_container_add (GTK_CONTAINER (convertwidget16), convertwidget17);
 
   gtk_option_menu_set_menu (GTK_OPTION_MENU (optionmenu1), convertwidget16);
 
   downloadfstab = gtk_label_new_with_mnemonic (_("_Download"));
+  gtk_widget_set_name (downloadfstab, "downloadfstab");
   gtk_widget_show (downloadfstab);
   gtk_notebook_set_tab_label (GTK_NOTEBOOK (fsnotebook), 
gtk_notebook_get_nth_page (GTK_NOTEBOOK (fsnotebook), 1), downloadfstab);
   gtk_label_set_justify (GTK_LABEL (downloadfstab), GTK_JUSTIFY_CENTER);
 
-  vbox9 = gtk_vbox_new (FALSE, 0);
-  gtk_widget_show (vbox9);
-  gtk_container_add (GTK_CONTAINER (fsnotebook), vbox9);
+  fsinsertvbox = gtk_vbox_new (FALSE, 0);
+  gtk_widget_set_name (fsinsertvbox, "fsinsertvbox");
+  gtk_widget_show (fsinsertvbox);
+  gtk_container_add (GTK_CONTAINER (fsnotebook), fsinsertvbox);
 
   hbox8 = gtk_hbox_new (FALSE, 0);
+  gtk_widget_set_name (hbox8, "hbox8");
   gtk_widget_show (hbox8);
-  gtk_box_pack_start (GTK_BOX (vbox9), hbox8, FALSE, FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (fsinsertvbox), hbox8, FALSE, FALSE, 0);
 
+  methodLabel = gtk_label_new_with_mnemonic (_("_Method:"));
+  gtk_widget_set_name (methodLabel, "methodLabel");
+  gtk_widget_show (methodLabel);
+  gtk_box_pack_start (GTK_BOX (hbox8), methodLabel, FALSE, FALSE, 0);
+  gtk_misc_set_padding (GTK_MISC (methodLabel), 5, 0);
+
   indexbutton = gtk_radio_button_new_with_mnemonic (NULL, _("index"));
+  gtk_widget_set_name (indexbutton, "indexbutton");
   gtk_widget_show (indexbutton);
   gtk_box_pack_start (GTK_BOX (hbox8), indexbutton, FALSE, FALSE, 0);
   gtk_radio_button_set_group (GTK_RADIO_BUTTON (indexbutton), 
indexbutton_group);
@@ -453,16 +579,25 @@
   gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (indexbutton), TRUE);
 
   insertButton = gtk_radio_button_new_with_mnemonic (NULL, _("insert"));
+  gtk_widget_set_name (insertButton, "insertButton");
   gtk_widget_show (insertButton);
   gtk_box_pack_start (GTK_BOX (hbox8), insertButton, FALSE, FALSE, 0);
   gtk_radio_button_set_group (GTK_RADIO_BUTTON (insertButton), 
indexbutton_group);
   indexbutton_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON 
(insertButton));
 
   hbox9 = gtk_hbox_new (FALSE, 0);
+  gtk_widget_set_name (hbox9, "hbox9");
   gtk_widget_show (hbox9);
-  gtk_box_pack_start (GTK_BOX (vbox9), hbox9, FALSE, FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (fsinsertvbox), hbox9, FALSE, FALSE, 0);
 
+  scopeLabel = gtk_label_new_with_mnemonic (_("_Scope:"));
+  gtk_widget_set_name (scopeLabel, "scopeLabel");
+  gtk_widget_show (scopeLabel);
+  gtk_box_pack_start (GTK_BOX (hbox9), scopeLabel, FALSE, FALSE, 0);
+  gtk_misc_set_padding (GTK_MISC (scopeLabel), 5, 0);
+
   radiobutton2 = gtk_radio_button_new_with_mnemonic (NULL, _("file only"));
+  gtk_widget_set_name (radiobutton2, "radiobutton2");
   gtk_widget_show (radiobutton2);
   gtk_box_pack_start (GTK_BOX (hbox9), radiobutton2, FALSE, FALSE, 0);
   gtk_radio_button_set_group (GTK_RADIO_BUTTON (radiobutton2), 
radiobutton2_group);
@@ -470,117 +605,186 @@
   gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (radiobutton2), TRUE);
 
   radiobutton3 = gtk_radio_button_new_with_mnemonic (NULL, _("recursive (for 
entire directories)"));
+  gtk_widget_set_name (radiobutton3, "radiobutton3");
   gtk_widget_show (radiobutton3);
   gtk_box_pack_start (GTK_BOX (hbox9), radiobutton3, FALSE, FALSE, 0);
   gtk_radio_button_set_group (GTK_RADIO_BUTTON (radiobutton3), 
radiobutton2_group);
   radiobutton2_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON 
(radiobutton3));
 
   hbox10 = gtk_hbox_new (FALSE, 0);
+  gtk_widget_set_name (hbox10, "hbox10");
   gtk_widget_show (hbox10);
-  gtk_box_pack_start (GTK_BOX (vbox9), hbox10, FALSE, FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (fsinsertvbox), hbox10, FALSE, FALSE, 0);
 
-  label54 = gtk_label_new_with_mnemonic (_("_Filename"));
+  label54 = gtk_label_new_with_mnemonic (_("_Filename:"));
+  gtk_widget_set_name (label54, "label54");
   gtk_widget_show (label54);
   gtk_box_pack_start (GTK_BOX (hbox10), label54, FALSE, FALSE, 0);
   gtk_label_set_justify (GTK_LABEL (label54), GTK_JUSTIFY_CENTER);
+  gtk_misc_set_padding (GTK_MISC (label54), 5, 0);
 
-  combo1 = gtk_combo_new ();
-  g_object_set_data (G_OBJECT (GTK_COMBO (combo1)->popwin),
-                     "GladeParentKey", combo1);
-  gtk_widget_show (combo1);
-  gtk_box_pack_start (GTK_BOX (hbox10), combo1, TRUE, TRUE, 0);
-  combo1_items = g_list_append (combo1_items, (gpointer) "");
-  gtk_combo_set_popdown_strings (GTK_COMBO (combo1), combo1_items);
-  g_list_free (combo1_items);
+  fsinsertfilenamecombo = gtk_combo_new ();
+  g_object_set_data (G_OBJECT (GTK_COMBO (fsinsertfilenamecombo)->popwin),
+                     "GladeParentKey", fsinsertfilenamecombo);
+  gtk_widget_set_name (fsinsertfilenamecombo, "fsinsertfilenamecombo");
+  gtk_widget_show (fsinsertfilenamecombo);
+  gtk_box_pack_start (GTK_BOX (hbox10), fsinsertfilenamecombo, TRUE, TRUE, 0);
+  fsinsertfilenamecombo_items = g_list_append (fsinsertfilenamecombo_items, 
(gpointer) "");
+  gtk_combo_set_popdown_strings (GTK_COMBO (fsinsertfilenamecombo), 
fsinsertfilenamecombo_items);
+  g_list_free (fsinsertfilenamecombo_items);
 
-  combo_entry1 = GTK_COMBO (combo1)->entry;
+  combo_entry1 = GTK_COMBO (fsinsertfilenamecombo)->entry;
+  gtk_widget_set_name (combo_entry1, "combo_entry1");
   gtk_widget_show (combo_entry1);
 
-  button9 = gtk_button_new_with_mnemonic (_("Browse"));
-  gtk_widget_show (button9);
-  gtk_box_pack_start (GTK_BOX (hbox10), button9, FALSE, FALSE, 0);
+  mainFileSharingInsertBrowseButton = gtk_button_new ();
+  gtk_widget_set_name (mainFileSharingInsertBrowseButton, 
"mainFileSharingInsertBrowseButton");
+  gtk_widget_show (mainFileSharingInsertBrowseButton);
+  gtk_box_pack_start (GTK_BOX (hbox10), mainFileSharingInsertBrowseButton, 
FALSE, FALSE, 0);
 
+  alignment7 = gtk_alignment_new (0.5, 0.5, 0, 0);
+  gtk_widget_set_name (alignment7, "alignment7");
+  gtk_widget_show (alignment7);
+  gtk_container_add (GTK_CONTAINER (mainFileSharingInsertBrowseButton), 
alignment7);
+
+  hbox20 = gtk_hbox_new (FALSE, 2);
+  gtk_widget_set_name (hbox20, "hbox20");
+  gtk_widget_show (hbox20);
+  gtk_container_add (GTK_CONTAINER (alignment7), hbox20);
+
+  image7 = gtk_image_new_from_stock ("gtk-home", GTK_ICON_SIZE_BUTTON);
+  gtk_widget_set_name (image7, "image7");
+  gtk_widget_show (image7);
+  gtk_box_pack_start (GTK_BOX (hbox20), image7, FALSE, FALSE, 0);
+
+  label70 = gtk_label_new_with_mnemonic (_("_Browse"));
+  gtk_widget_set_name (label70, "label70");
+  gtk_widget_show (label70);
+  gtk_box_pack_start (GTK_BOX (hbox20), label70, FALSE, FALSE, 0);
+
+  fsinsertuploadbutton = gtk_button_new ();
+  gtk_widget_set_name (fsinsertuploadbutton, "fsinsertuploadbutton");
+  gtk_widget_show (fsinsertuploadbutton);
+  gtk_box_pack_start (GTK_BOX (fsinsertvbox), fsinsertuploadbutton, FALSE, 
FALSE, 0);
+
+  alignment9 = gtk_alignment_new (0.5, 0.5, 0, 0);
+  gtk_widget_set_name (alignment9, "alignment9");
+  gtk_widget_show (alignment9);
+  gtk_container_add (GTK_CONTAINER (fsinsertuploadbutton), alignment9);
+
+  hbox22 = gtk_hbox_new (FALSE, 2);
+  gtk_widget_set_name (hbox22, "hbox22");
+  gtk_widget_show (hbox22);
+  gtk_container_add (GTK_CONTAINER (alignment9), hbox22);
+
+  image9 = gtk_image_new_from_stock ("gtk-go-up", GTK_ICON_SIZE_BUTTON);
+  gtk_widget_set_name (image9, "image9");
+  gtk_widget_show (image9);
+  gtk_box_pack_start (GTK_BOX (hbox22), image9, FALSE, FALSE, 0);
+
+  label74 = gtk_label_new_with_mnemonic (_("_Upload"));
+  gtk_widget_set_name (label74, "label74");
+  gtk_widget_show (label74);
+  gtk_box_pack_start (GTK_BOX (hbox22), label74, FALSE, FALSE, 0);
+
   insertfstab = gtk_label_new_with_mnemonic (_("_Insert"));
+  gtk_widget_set_name (insertfstab, "insertfstab");
   gtk_widget_show (insertfstab);
   gtk_notebook_set_tab_label (GTK_NOTEBOOK (fsnotebook), 
gtk_notebook_get_nth_page (GTK_NOTEBOOK (fsnotebook), 2), insertfstab);
   gtk_label_set_justify (GTK_LABEL (insertfstab), GTK_JUSTIFY_CENTER);
 
-  vbox6 = gtk_vbox_new (FALSE, 0);
-  gtk_widget_show (vbox6);
-  gtk_container_add (GTK_CONTAINER (fsnotebook), vbox6);
+  fsadvancedvbox = gtk_vbox_new (FALSE, 0);
+  gtk_widget_set_name (fsadvancedvbox, "fsadvancedvbox");
+  gtk_widget_show (fsadvancedvbox);
+  gtk_container_add (GTK_CONTAINER (fsnotebook), fsadvancedvbox);
 
   menubar2 = gtk_menu_bar_new ();
+  gtk_widget_set_name (menubar2, "menubar2");
   gtk_widget_show (menubar2);
-  gtk_box_pack_start (GTK_BOX (vbox6), menubar2, FALSE, FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (fsadvancedvbox), menubar2, FALSE, FALSE, 0);
 
   createNamespace = gtk_menu_item_new_with_mnemonic (_("_create"));
+  gtk_widget_set_name (createNamespace, "createNamespace");
   gtk_widget_show (createNamespace);
   gtk_container_add (GTK_CONTAINER (menubar2), createNamespace);
 
   createNamespace_menu = gtk_menu_new ();
+  gtk_widget_set_name (createNamespace_menu, "createNamespace_menu");
   gtk_menu_item_set_submenu (GTK_MENU_ITEM (createNamespace), 
createNamespace_menu);
 
   namespace1 = gtk_menu_item_new_with_mnemonic (_("_Namespace"));
+  gtk_widget_set_name (namespace1, "namespace1");
   gtk_widget_show (namespace1);
   gtk_container_add (GTK_CONTAINER (createNamespace_menu), namespace1);
 
   directory1 = gtk_menu_item_new_with_mnemonic (_("_Directory"));
+  gtk_widget_set_name (directory1, "directory1");
   gtk_widget_show (directory1);
   gtk_container_add (GTK_CONTAINER (createNamespace_menu), directory1);
 
   collection1 = gtk_menu_item_new_with_mnemonic (_("_Collection"));
+  gtk_widget_set_name (collection1, "collection1");
   gtk_widget_show (collection1);
   gtk_container_add (GTK_CONTAINER (createNamespace_menu), collection1);
 
   advertisement1 = gtk_menu_item_new_with_mnemonic (_("_Advertisement"));
+  gtk_widget_set_name (advertisement1, "advertisement1");
   gtk_widget_show (advertisement1);
   gtk_container_add (GTK_CONTAINER (createNamespace_menu), advertisement1);
 
   delete1 = gtk_menu_item_new_with_mnemonic (_("_delete"));
+  gtk_widget_set_name (delete1, "delete1");
   gtk_widget_show (delete1);
   gtk_container_add (GTK_CONTAINER (menubar2), delete1);
 
   delete1_menu = gtk_menu_new ();
+  gtk_widget_set_name (delete1_menu, "delete1_menu");
   gtk_menu_item_set_submenu (GTK_MENU_ITEM (delete1), delete1_menu);
 
   namespace2 = gtk_menu_item_new_with_mnemonic (_("_Namespace"));
+  gtk_widget_set_name (namespace2, "namespace2");
   gtk_widget_show (namespace2);
   gtk_container_add (GTK_CONTAINER (delete1_menu), namespace2);
   gtk_tooltips_set_tip (tooltips, namespace2, _("Will prevent future 
insertions into the namespace (will not delete content in the namespace)"), 
NULL);
 
   collection2 = gtk_menu_item_new_with_mnemonic (_("_Collection"));
+  gtk_widget_set_name (collection2, "collection2");
   gtk_widget_show (collection2);
   gtk_container_add (GTK_CONTAINER (delete1_menu), collection2);
   gtk_tooltips_set_tip (tooltips, collection2, _("end collection (will not 
delete content already in the collection)"), NULL);
 
   notebook4 = gtk_notebook_new ();
-  gtk_widget_show (notebook4);
-  gtk_box_pack_start (GTK_BOX (vbox6), notebook4, TRUE, TRUE, 0);
+  gtk_widget_set_name (notebook4, "notebook4");
+  gtk_box_pack_start (GTK_BOX (fsadvancedvbox), notebook4, TRUE, TRUE, 0);
 
   label62 = gtk_label_new (_("label62"));
-  gtk_widget_show (label62);
+  gtk_widget_set_name (label62, "label62");
   gtk_container_add (GTK_CONTAINER (notebook4), label62);
 
   label39 = gtk_label_new (_("label39"));
-  gtk_widget_show (label39);
+  gtk_widget_set_name (label39, "label39");
   gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook4), 
gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook4), 0), label39);
   gtk_label_set_justify (GTK_LABEL (label39), GTK_JUSTIFY_CENTER);
 
   frame11 = gtk_frame_new (NULL);
+  gtk_widget_set_name (frame11, "frame11");
   gtk_widget_show (frame11);
-  gtk_box_pack_start (GTK_BOX (vbox6), frame11, TRUE, TRUE, 0);
+  gtk_box_pack_start (GTK_BOX (fsadvancedvbox), frame11, TRUE, TRUE, 0);
 
   scrolledwindow3 = gtk_scrolled_window_new (NULL, NULL);
+  gtk_widget_set_name (scrolledwindow3, "scrolledwindow3");
   gtk_widget_show (scrolledwindow3);
   gtk_container_add (GTK_CONTAINER (frame11), scrolledwindow3);
   GTK_WIDGET_UNSET_FLAGS (scrolledwindow3, GTK_CAN_FOCUS);
   gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow3), 
GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
 
   viewport3 = gtk_viewport_new (NULL, NULL);
+  gtk_widget_set_name (viewport3, "viewport3");
   gtk_widget_show (viewport3);
   gtk_container_add (GTK_CONTAINER (scrolledwindow3), viewport3);
 
   scrolledwindow4 = gtk_scrolled_window_new (NULL, NULL);
+  gtk_widget_set_name (scrolledwindow4, "scrolledwindow4");
   gtk_widget_show (scrolledwindow4);
   gtk_container_add (GTK_CONTAINER (viewport3), scrolledwindow4);
   GTK_WIDGET_UNSET_FLAGS (scrolledwindow4, GTK_CAN_FOCUS);
@@ -588,84 +792,90 @@
   gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolledwindow4), 
GTK_SHADOW_IN);
 
   clist1 = gtk_tree_view_new ();
+  gtk_widget_set_name (clist1, "clist1");
   gtk_widget_show (clist1);
   gtk_container_add (GTK_CONTAINER (scrolledwindow4), clist1);
 
-  label55 = gtk_label_new (_("Content"));
+  label55 = gtk_label_new (_("Available Content"));
+  gtk_widget_set_name (label55, "label55");
   gtk_widget_show (label55);
   gtk_frame_set_label_widget (GTK_FRAME (frame11), label55);
 
   advancedfstab = gtk_label_new_with_mnemonic (_("_Advanced"));
+  gtk_widget_set_name (advancedfstab, "advancedfstab");
   gtk_widget_show (advancedfstab);
   gtk_notebook_set_tab_label (GTK_NOTEBOOK (fsnotebook), 
gtk_notebook_get_nth_page (GTK_NOTEBOOK (fsnotebook), 3), advancedfstab);
   gtk_label_set_justify (GTK_LABEL (advancedfstab), GTK_JUSTIFY_CENTER);
 
   fstab = gtk_label_new_with_mnemonic (_("_File sharing"));
+  gtk_widget_set_name (fstab, "fstab");
   gtk_widget_show (fstab);
-  gtk_notebook_set_tab_label (GTK_NOTEBOOK (mainnotebook), 
gtk_notebook_get_nth_page (GTK_NOTEBOOK (mainnotebook), 1), fstab);
+  gtk_notebook_set_tab_label (GTK_NOTEBOOK (mainnotebook), 
gtk_notebook_get_nth_page (GTK_NOTEBOOK (mainnotebook), 2), fstab);
   gtk_label_set_justify (GTK_LABEL (fstab), GTK_JUSTIFY_CENTER);
 
-  vbox3 = gtk_vbox_new (FALSE, 0);
-  gtk_widget_show (vbox3);
-  gtk_container_add (GTK_CONTAINER (mainnotebook), vbox3);
+  statisticsnotebookvbox = gtk_vbox_new (FALSE, 0);
+  gtk_widget_set_name (statisticsnotebookvbox, "statisticsnotebookvbox");
+  gtk_container_add (GTK_CONTAINER (mainnotebook), statisticsnotebookvbox);
 
   label68 = gtk_label_new (_("label68"));
+  gtk_widget_set_name (label68, "label68");
   gtk_widget_show (label68);
-  gtk_box_pack_start (GTK_BOX (vbox3), label68, FALSE, FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (statisticsnotebookvbox), label68, FALSE, FALSE, 
0);
 
   label5 = gtk_label_new_with_mnemonic (_("_Statistics"));
+  gtk_widget_set_name (label5, "label5");
   gtk_widget_show (label5);
-  gtk_notebook_set_tab_label (GTK_NOTEBOOK (mainnotebook), 
gtk_notebook_get_nth_page (GTK_NOTEBOOK (mainnotebook), 2), label5);
+  gtk_notebook_set_tab_label (GTK_NOTEBOOK (mainnotebook), 
gtk_notebook_get_nth_page (GTK_NOTEBOOK (mainnotebook), 3), label5);
   gtk_label_set_justify (GTK_LABEL (label5), GTK_JUSTIFY_CENTER);
 
-  vbox4 = gtk_vbox_new (FALSE, 0);
-  gtk_widget_show (vbox4);
-  gtk_container_add (GTK_CONTAINER (mainnotebook), vbox4);
+  chatnotbookvbox = gtk_vbox_new (FALSE, 0);
+  gtk_widget_set_name (chatnotbookvbox, "chatnotbookvbox");
+  gtk_widget_show (chatnotbookvbox);
+  gtk_container_add (GTK_CONTAINER (mainnotebook), chatnotbookvbox);
 
   notebook3 = gtk_notebook_new ();
-  gtk_widget_show (notebook3);
-  gtk_box_pack_start (GTK_BOX (vbox4), notebook3, TRUE, TRUE, 0);
+  gtk_widget_set_name (notebook3, "notebook3");
+  gtk_box_pack_start (GTK_BOX (chatnotbookvbox), notebook3, TRUE, TRUE, 0);
 
-  scrolledwindow13 = gtk_scrolled_window_new (NULL, NULL);
-  gtk_widget_show (scrolledwindow13);
-  gtk_container_add (GTK_CONTAINER (notebook3), scrolledwindow13);
-  gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolledwindow13), 
GTK_SHADOW_IN);
+  label72 = gtk_label_new (_("label72"));
+  gtk_widget_set_name (label72, "label72");
+  gtk_container_add (GTK_CONTAINER (notebook3), label72);
 
-  viewport4 = gtk_viewport_new (NULL, NULL);
-  gtk_widget_show (viewport4);
-  gtk_container_add (GTK_CONTAINER (scrolledwindow13), viewport4);
-
-  label59 = gtk_label_new (_("label59"));
-  gtk_widget_show (label59);
-  gtk_container_add (GTK_CONTAINER (viewport4), label59);
-
   label38 = gtk_label_new (_("label38"));
-  gtk_widget_show (label38);
+  gtk_widget_set_name (label38, "label38");
   gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook3), 
gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook3), 0), label38);
   gtk_label_set_justify (GTK_LABEL (label38), GTK_JUSTIFY_CENTER);
 
   combo3 = gtk_combo_new ();
   g_object_set_data (G_OBJECT (GTK_COMBO (combo3)->popwin),
                      "GladeParentKey", combo3);
+  gtk_widget_set_name (combo3, "combo3");
   gtk_widget_show (combo3);
-  gtk_box_pack_start (GTK_BOX (vbox4), combo3, FALSE, FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (chatnotbookvbox), combo3, FALSE, FALSE, 0);
   gtk_combo_set_case_sensitive (GTK_COMBO (combo3), TRUE);
   combo3_items = g_list_append (combo3_items, (gpointer) _("/join #gnunet"));
   combo3_items = g_list_append (combo3_items, (gpointer) "");
   gtk_combo_set_popdown_strings (GTK_COMBO (combo3), combo3_items);
   g_list_free (combo3_items);
 
-  combo_entry3 = GTK_COMBO (combo3)->entry;
-  gtk_widget_show (combo_entry3);
+  chatMainEntryLine = GTK_COMBO (combo3)->entry;
+  gtk_widget_set_name (chatMainEntryLine, "chatMainEntryLine");
+  gtk_widget_show (chatMainEntryLine);
+  gtk_widget_add_accelerator (chatMainEntryLine, "activate", accel_group,
+                              GDK_Return, 0,
+                              GTK_ACCEL_VISIBLE);
 
-  label6 = gtk_label_new_with_mnemonic (_("_Chat"));
-  gtk_widget_show (label6);
-  gtk_notebook_set_tab_label (GTK_NOTEBOOK (mainnotebook), 
gtk_notebook_get_nth_page (GTK_NOTEBOOK (mainnotebook), 3), label6);
-  gtk_label_set_justify (GTK_LABEL (label6), GTK_JUSTIFY_CENTER);
+  chatNotebookLabel = gtk_label_new_with_mnemonic (_("_Chat"));
+  gtk_widget_set_name (chatNotebookLabel, "chatNotebookLabel");
+  gtk_widget_show (chatNotebookLabel);
+  gtk_notebook_set_tab_label (GTK_NOTEBOOK (mainnotebook), 
gtk_notebook_get_nth_page (GTK_NOTEBOOK (mainnotebook), 4), chatNotebookLabel);
+  gtk_label_set_justify (GTK_LABEL (chatNotebookLabel), GTK_JUSTIFY_CENTER);
 
   statusbar = gtk_statusbar_new ();
+  gtk_widget_set_name (statusbar, "statusbar");
   gtk_widget_show (statusbar);
   gtk_box_pack_start (GTK_BOX (vbox1), statusbar, FALSE, FALSE, 0);
+  gtk_widget_set_sensitive (statusbar, FALSE);
 
   g_signal_connect_after ((gpointer) mainWindow, "delete_event",
                           G_CALLBACK (gtk_main_quit),
@@ -676,49 +886,80 @@
   g_signal_connect ((gpointer) about, "activate",
                     G_CALLBACK (on_about_activate),
                     NULL);
-  g_signal_connect ((gpointer) namespace1, "activate",
+  g_signal_connect ((gpointer) startGnunetdButton, "clicked",
+                    G_CALLBACK (on_startGnunetdButton_clicked),
+                    NULL);
+  g_signal_connect ((gpointer) stopDaemon, "clicked",
+                    G_CALLBACK (on_stopDaemon_clicked),
+                    NULL);
+  g_signal_connect_swapped ((gpointer) fssearchbutton, "clicked",
+                            G_CALLBACK (on_fssearchbutton_clicked),
+                            GTK_OBJECT (fssearchhbox));
+  g_signal_connect_swapped ((gpointer) mainFileSharingInsertBrowseButton, 
"activate",
+                            G_CALLBACK 
(on_mainFileSharingInsertBrowseButton_activate),
+                            GTK_OBJECT (fsinsertfilenamecombo));
+  g_signal_connect_swapped ((gpointer) fsinsertuploadbutton, "clicked",
+                            G_CALLBACK (on_fsinsertuploadbutton_clicked),
+                            GTK_OBJECT (fsinsertvbox));
+  g_signal_connect ((gpointer) namespace1, "activate_item",
                     G_CALLBACK (on_create_namespace_activate),
                     NULL);
-  g_signal_connect ((gpointer) directory1, "activate",
+  g_signal_connect ((gpointer) directory1, "activate_item",
                     G_CALLBACK (on_create_directory_activate),
                     NULL);
-  g_signal_connect ((gpointer) collection1, "activate",
+  g_signal_connect ((gpointer) collection1, "activate_item",
                     G_CALLBACK (on_create_collection_activate),
                     NULL);
-  g_signal_connect ((gpointer) advertisement1, "activate",
+  g_signal_connect ((gpointer) advertisement1, "activate_item",
                     G_CALLBACK (on_create_advertisement_activate),
                     NULL);
-  g_signal_connect ((gpointer) namespace2, "activate",
+  g_signal_connect ((gpointer) namespace2, "activate_item",
                     G_CALLBACK (on_namespace2_activate),
                     NULL);
-  g_signal_connect ((gpointer) collection2, "activate",
+  g_signal_connect ((gpointer) collection2, "activate_item",
                     G_CALLBACK (on_collection_delete_activate),
                     NULL);
+  g_signal_connect ((gpointer) chatMainEntryLine, "activate",
+                    G_CALLBACK (chatMainEntryLine_activate),
+                    NULL);
+  g_signal_connect ((gpointer) chatMainEntryLine, "editing_done",
+                    G_CALLBACK (on_chatMainEntryLine_editing_done),
+                    NULL);
 
+  gtk_label_set_mnemonic_widget (GTK_LABEL (methodLabel), indexbutton);
+  gtk_label_set_mnemonic_widget (GTK_LABEL (scopeLabel), radiobutton2);
   gtk_label_set_mnemonic_widget (GTK_LABEL (label54), combo_entry1);
 
+  atko = gtk_widget_get_accessible (welcomelabel);
+  atk_object_set_name (atko, _("Splash Screen"));
+
   atko = gtk_widget_get_accessible (statusPixmap);
   atk_object_set_name (atko, _("status"));
   atk_object_set_description (atko, _("gnunetd status"));
 
+  atko = gtk_widget_get_accessible (fsSearchStringInputLine);
+  atk_object_set_description (atko, _("Enter the keywords to search for in 
this line."));
 
+
   /* Store pointers to all widgets, for use by lookup_widget(). */
   GLADE_HOOKUP_OBJECT_NO_REF (mainWindow, mainWindow, "mainWindow");
   GLADE_HOOKUP_OBJECT (mainWindow, vbox1, "vbox1");
-  GLADE_HOOKUP_OBJECT (mainWindow, menubar1, "menubar1");
+  GLADE_HOOKUP_OBJECT (mainWindow, main_app_menubar, "main_app_menubar");
   GLADE_HOOKUP_OBJECT (mainWindow, quit1, "quit1");
   GLADE_HOOKUP_OBJECT (mainWindow, help1, "help1");
   GLADE_HOOKUP_OBJECT (mainWindow, help1_menu, "help1_menu");
   GLADE_HOOKUP_OBJECT (mainWindow, about, "about");
   GLADE_HOOKUP_OBJECT (mainWindow, mainnotebook, "mainnotebook");
-  GLADE_HOOKUP_OBJECT (mainWindow, scrolledwindow1, "scrolledwindow1");
+  GLADE_HOOKUP_OBJECT (mainWindow, splashScreen, "splashScreen");
+  GLADE_HOOKUP_OBJECT (mainWindow, welcomelabel, "welcomelabel");
+  GLADE_HOOKUP_OBJECT (mainWindow, fs_scrolledwindow, "fs_scrolledwindow");
   GLADE_HOOKUP_OBJECT (mainWindow, viewport1, "viewport1");
   GLADE_HOOKUP_OBJECT (mainWindow, scrolledwindow2, "scrolledwindow2");
   GLADE_HOOKUP_OBJECT (mainWindow, viewport2, "viewport2");
   GLADE_HOOKUP_OBJECT (mainWindow, vbox2, "vbox2");
   GLADE_HOOKUP_OBJECT (mainWindow, frame3, "frame3");
   GLADE_HOOKUP_OBJECT (mainWindow, hbox2, "hbox2");
-  GLADE_HOOKUP_OBJECT (mainWindow, button10, "button10");
+  GLADE_HOOKUP_OBJECT (mainWindow, startGnunetdButton, "startGnunetdButton");
   GLADE_HOOKUP_OBJECT (mainWindow, alignment1, "alignment1");
   GLADE_HOOKUP_OBJECT (mainWindow, hbox11, "hbox11");
   GLADE_HOOKUP_OBJECT (mainWindow, image1, "image1");
@@ -729,7 +970,7 @@
   GLADE_HOOKUP_OBJECT (mainWindow, image2, "image2");
   GLADE_HOOKUP_OBJECT (mainWindow, label64, "label64");
   GLADE_HOOKUP_OBJECT (mainWindow, statusPixmap, "statusPixmap");
-  GLADE_HOOKUP_OBJECT (mainWindow, label1, "label1");
+  GLADE_HOOKUP_OBJECT (mainWindow, gnunetdControlLabel, "gnunetdControlLabel");
   GLADE_HOOKUP_OBJECT (mainWindow, frame2, "frame2");
   GLADE_HOOKUP_OBJECT (mainWindow, statisticsLabel, "statisticsLabel");
   GLADE_HOOKUP_OBJECT (mainWindow, label2, "label2");
@@ -737,9 +978,9 @@
   GLADE_HOOKUP_OBJECT (mainWindow, scrolledwindow5, "scrolledwindow5");
   GLADE_HOOKUP_OBJECT (mainWindow, clist2, "clist2");
   GLADE_HOOKUP_OBJECT (mainWindow, label3, "label3");
-  GLADE_HOOKUP_OBJECT (mainWindow, label1, "label1");
+  GLADE_HOOKUP_OBJECT (mainWindow, generalLabel, "generalLabel");
   GLADE_HOOKUP_OBJECT (mainWindow, fsnotebook, "fsnotebook");
-  GLADE_HOOKUP_OBJECT (mainWindow, vbox5, "vbox5");
+  GLADE_HOOKUP_OBJECT (mainWindow, fsstatusvbox, "fsstatusvbox");
   GLADE_HOOKUP_OBJECT (mainWindow, frame8, "frame8");
   GLADE_HOOKUP_OBJECT (mainWindow, scrolledwindow9, "scrolledwindow9");
   GLADE_HOOKUP_OBJECT (mainWindow, clist7, "clist7");
@@ -753,33 +994,48 @@
   GLADE_HOOKUP_OBJECT (mainWindow, clist6, "clist6");
   GLADE_HOOKUP_OBJECT (mainWindow, label46, "label46");
   GLADE_HOOKUP_OBJECT (mainWindow, statusfstab, "statusfstab");
-  GLADE_HOOKUP_OBJECT (mainWindow, vbox7, "vbox7");
+  GLADE_HOOKUP_OBJECT (mainWindow, fsdownloadvbox, "fsdownloadvbox");
   GLADE_HOOKUP_OBJECT (mainWindow, notebook6, "notebook6");
   GLADE_HOOKUP_OBJECT (mainWindow, label61, "label61");
   GLADE_HOOKUP_OBJECT (mainWindow, label36, "label36");
-  GLADE_HOOKUP_OBJECT (mainWindow, hbox4, "hbox4");
-  GLADE_HOOKUP_OBJECT (mainWindow, combo2, "combo2");
+  GLADE_HOOKUP_OBJECT (mainWindow, fssearchhbox, "fssearchhbox");
+  GLADE_HOOKUP_OBJECT (mainWindow, fsSearchStringInputLine, 
"fsSearchStringInputLine");
   GLADE_HOOKUP_OBJECT (mainWindow, combo_entry2, "combo_entry2");
   GLADE_HOOKUP_OBJECT (mainWindow, fssearchbutton, "fssearchbutton");
+  GLADE_HOOKUP_OBJECT (mainWindow, alignment8, "alignment8");
+  GLADE_HOOKUP_OBJECT (mainWindow, hbox21, "hbox21");
+  GLADE_HOOKUP_OBJECT (mainWindow, image8, "image8");
+  GLADE_HOOKUP_OBJECT (mainWindow, label71, "label71");
   GLADE_HOOKUP_OBJECT (mainWindow, label40, "label40");
   GLADE_HOOKUP_OBJECT (mainWindow, optionmenu1, "optionmenu1");
   GLADE_HOOKUP_OBJECT (mainWindow, convertwidget16, "convertwidget16");
   GLADE_HOOKUP_OBJECT (mainWindow, convertwidget17, "convertwidget17");
   GLADE_HOOKUP_OBJECT (mainWindow, downloadfstab, "downloadfstab");
-  GLADE_HOOKUP_OBJECT (mainWindow, vbox9, "vbox9");
+  GLADE_HOOKUP_OBJECT (mainWindow, fsinsertvbox, "fsinsertvbox");
   GLADE_HOOKUP_OBJECT (mainWindow, hbox8, "hbox8");
+  GLADE_HOOKUP_OBJECT (mainWindow, methodLabel, "methodLabel");
   GLADE_HOOKUP_OBJECT (mainWindow, indexbutton, "indexbutton");
   GLADE_HOOKUP_OBJECT (mainWindow, insertButton, "insertButton");
   GLADE_HOOKUP_OBJECT (mainWindow, hbox9, "hbox9");
+  GLADE_HOOKUP_OBJECT (mainWindow, scopeLabel, "scopeLabel");
   GLADE_HOOKUP_OBJECT (mainWindow, radiobutton2, "radiobutton2");
   GLADE_HOOKUP_OBJECT (mainWindow, radiobutton3, "radiobutton3");
   GLADE_HOOKUP_OBJECT (mainWindow, hbox10, "hbox10");
   GLADE_HOOKUP_OBJECT (mainWindow, label54, "label54");
-  GLADE_HOOKUP_OBJECT (mainWindow, combo1, "combo1");
+  GLADE_HOOKUP_OBJECT (mainWindow, fsinsertfilenamecombo, 
"fsinsertfilenamecombo");
   GLADE_HOOKUP_OBJECT (mainWindow, combo_entry1, "combo_entry1");
-  GLADE_HOOKUP_OBJECT (mainWindow, button9, "button9");
+  GLADE_HOOKUP_OBJECT (mainWindow, mainFileSharingInsertBrowseButton, 
"mainFileSharingInsertBrowseButton");
+  GLADE_HOOKUP_OBJECT (mainWindow, alignment7, "alignment7");
+  GLADE_HOOKUP_OBJECT (mainWindow, hbox20, "hbox20");
+  GLADE_HOOKUP_OBJECT (mainWindow, image7, "image7");
+  GLADE_HOOKUP_OBJECT (mainWindow, label70, "label70");
+  GLADE_HOOKUP_OBJECT (mainWindow, fsinsertuploadbutton, 
"fsinsertuploadbutton");
+  GLADE_HOOKUP_OBJECT (mainWindow, alignment9, "alignment9");
+  GLADE_HOOKUP_OBJECT (mainWindow, hbox22, "hbox22");
+  GLADE_HOOKUP_OBJECT (mainWindow, image9, "image9");
+  GLADE_HOOKUP_OBJECT (mainWindow, label74, "label74");
   GLADE_HOOKUP_OBJECT (mainWindow, insertfstab, "insertfstab");
-  GLADE_HOOKUP_OBJECT (mainWindow, vbox6, "vbox6");
+  GLADE_HOOKUP_OBJECT (mainWindow, fsadvancedvbox, "fsadvancedvbox");
   GLADE_HOOKUP_OBJECT (mainWindow, menubar2, "menubar2");
   GLADE_HOOKUP_OBJECT (mainWindow, createNamespace, "createNamespace");
   GLADE_HOOKUP_OBJECT (mainWindow, createNamespace_menu, 
"createNamespace_menu");
@@ -802,18 +1058,16 @@
   GLADE_HOOKUP_OBJECT (mainWindow, label55, "label55");
   GLADE_HOOKUP_OBJECT (mainWindow, advancedfstab, "advancedfstab");
   GLADE_HOOKUP_OBJECT (mainWindow, fstab, "fstab");
-  GLADE_HOOKUP_OBJECT (mainWindow, vbox3, "vbox3");
+  GLADE_HOOKUP_OBJECT (mainWindow, statisticsnotebookvbox, 
"statisticsnotebookvbox");
   GLADE_HOOKUP_OBJECT (mainWindow, label68, "label68");
   GLADE_HOOKUP_OBJECT (mainWindow, label5, "label5");
-  GLADE_HOOKUP_OBJECT (mainWindow, vbox4, "vbox4");
+  GLADE_HOOKUP_OBJECT (mainWindow, chatnotbookvbox, "chatnotbookvbox");
   GLADE_HOOKUP_OBJECT (mainWindow, notebook3, "notebook3");
-  GLADE_HOOKUP_OBJECT (mainWindow, scrolledwindow13, "scrolledwindow13");
-  GLADE_HOOKUP_OBJECT (mainWindow, viewport4, "viewport4");
-  GLADE_HOOKUP_OBJECT (mainWindow, label59, "label59");
+  GLADE_HOOKUP_OBJECT (mainWindow, label72, "label72");
   GLADE_HOOKUP_OBJECT (mainWindow, label38, "label38");
   GLADE_HOOKUP_OBJECT (mainWindow, combo3, "combo3");
-  GLADE_HOOKUP_OBJECT (mainWindow, combo_entry3, "combo_entry3");
-  GLADE_HOOKUP_OBJECT (mainWindow, label6, "label6");
+  GLADE_HOOKUP_OBJECT (mainWindow, chatMainEntryLine, "chatMainEntryLine");
+  GLADE_HOOKUP_OBJECT (mainWindow, chatNotebookLabel, "chatNotebookLabel");
   GLADE_HOOKUP_OBJECT (mainWindow, statusbar, "statusbar");
   GLADE_HOOKUP_OBJECT_NO_REF (mainWindow, tooltips, "tooltips");
 
@@ -823,209 +1077,339 @@
 }
 
 GtkWidget*
-create_metadatadialog (void)
+create_metaDataDialog (void)
 {
-  GtkWidget *metadatadialog;
+  GtkWidget *metaDataDialog;
+  AtkObject *atko;
+  GdkPixbuf *metaDataDialog_icon_pixbuf;
   GtkWidget *dialog_vbox1;
-  GtkWidget *vbox8;
   GtkWidget *label51;
   GtkWidget *hbox6;
   GtkWidget *label49;
   GtkWidget *optionmenu2;
   GtkWidget *convertwidget30;
   GtkWidget *convertwidget31;
-  GtkWidget *convertwidget32;
-  GtkWidget *convertwidget33;
   GtkWidget *label50;
-  GtkWidget *entry3;
+  GtkWidget *metaDataDialogValueEntry;
   GtkWidget *frame12;
   GtkWidget *scrolledwindow10;
-  GtkWidget *clist8;
+  GtkWidget *metaDataDialogMetaDataList;
   GtkWidget *label56;
   GtkWidget *hbox7;
   GtkWidget *label47;
-  GtkWidget *entry4;
-  GtkWidget *frame13;
-  GtkWidget *scrolledwindow11;
-  GtkWidget *clist9;
+  GtkWidget *fileInformationKeywordEntry;
+  GtkWidget *metaDataDialogKeywordFrame;
+  GtkWidget *metaDataDialogKeywordScrolledWindow;
+  GtkWidget *metaDataDialogKeywordList;
   GtkWidget *label57;
   GtkWidget *dialog_action_area1;
-  GtkWidget *button7;
+  GtkWidget *metaDataDialogDeleteButton;
+  GtkWidget *metaDataDialogCancelButton;
+  GtkWidget *metaDataDialogApplyButton;
+  GtkAccelGroup *accel_group;
+  GtkTooltips *tooltips;
 
-  metadatadialog = gtk_dialog_new ();
-  gtk_window_set_title (GTK_WINDOW (metadatadialog), _("File Information"));
-  gtk_window_set_type_hint (GTK_WINDOW (metadatadialog), 
GDK_WINDOW_TYPE_HINT_DIALOG);
+  tooltips = gtk_tooltips_new ();
 
-  dialog_vbox1 = GTK_DIALOG (metadatadialog)->vbox;
+  accel_group = gtk_accel_group_new ();
+
+  metaDataDialog = gtk_dialog_new ();
+  gtk_widget_set_name (metaDataDialog, "metaDataDialog");
+  gtk_window_set_title (GTK_WINDOW (metaDataDialog), _("Edit File 
Information"));
+  gtk_window_set_modal (GTK_WINDOW (metaDataDialog), TRUE);
+  metaDataDialog_icon_pixbuf = create_pixbuf ("info.png");
+  if (metaDataDialog_icon_pixbuf)
+    {
+      gtk_window_set_icon (GTK_WINDOW (metaDataDialog), 
metaDataDialog_icon_pixbuf);
+      gdk_pixbuf_unref (metaDataDialog_icon_pixbuf);
+    }
+  gtk_window_set_type_hint (GTK_WINDOW (metaDataDialog), 
GDK_WINDOW_TYPE_HINT_DIALOG);
+
+  dialog_vbox1 = GTK_DIALOG (metaDataDialog)->vbox;
+  gtk_widget_set_name (dialog_vbox1, "dialog_vbox1");
   gtk_widget_show (dialog_vbox1);
 
-  vbox8 = gtk_vbox_new (FALSE, 0);
-  gtk_widget_show (vbox8);
-  gtk_box_pack_start (GTK_BOX (dialog_vbox1), vbox8, TRUE, TRUE, 0);
-
   label51 = gtk_label_new (_("Please provide meta-data and keywords for the 
content."));
+  gtk_widget_set_name (label51, "label51");
   gtk_widget_show (label51);
-  gtk_box_pack_start (GTK_BOX (vbox8), label51, FALSE, FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (dialog_vbox1), label51, FALSE, FALSE, 0);
   gtk_label_set_justify (GTK_LABEL (label51), GTK_JUSTIFY_CENTER);
   gtk_misc_set_padding (GTK_MISC (label51), 9, 5);
 
   hbox6 = gtk_hbox_new (FALSE, 0);
+  gtk_widget_set_name (hbox6, "hbox6");
   gtk_widget_show (hbox6);
-  gtk_box_pack_start (GTK_BOX (vbox8), hbox6, FALSE, FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (dialog_vbox1), hbox6, FALSE, FALSE, 0);
 
-  label49 = gtk_label_new_with_mnemonic (_("_Type"));
+  label49 = gtk_label_new_with_mnemonic (_("_Type:"));
+  gtk_widget_set_name (label49, "label49");
   gtk_widget_show (label49);
   gtk_box_pack_start (GTK_BOX (hbox6), label49, FALSE, FALSE, 0);
-  gtk_label_set_justify (GTK_LABEL (label49), GTK_JUSTIFY_CENTER);
+  gtk_misc_set_padding (GTK_MISC (label49), 5, 0);
 
   optionmenu2 = gtk_option_menu_new ();
+  gtk_widget_set_name (optionmenu2, "optionmenu2");
   gtk_widget_show (optionmenu2);
   gtk_box_pack_start (GTK_BOX (hbox6), optionmenu2, FALSE, FALSE, 0);
 
   convertwidget30 = gtk_menu_new ();
+  gtk_widget_set_name (convertwidget30, "convertwidget30");
 
   convertwidget31 = gtk_menu_item_new_with_mnemonic (_("unknown"));
+  gtk_widget_set_name (convertwidget31, "convertwidget31");
   gtk_widget_show (convertwidget31);
   gtk_container_add (GTK_CONTAINER (convertwidget30), convertwidget31);
 
-  convertwidget32 = gtk_menu_item_new_with_mnemonic (_("filename"));
-  gtk_widget_show (convertwidget32);
-  gtk_container_add (GTK_CONTAINER (convertwidget30), convertwidget32);
-
-  convertwidget33 = gtk_menu_item_new_with_mnemonic (_("meta-data"));
-  gtk_widget_show (convertwidget33);
-  gtk_container_add (GTK_CONTAINER (convertwidget30), convertwidget33);
-
   gtk_option_menu_set_menu (GTK_OPTION_MENU (optionmenu2), convertwidget30);
 
-  label50 = gtk_label_new_with_mnemonic (_("_Value"));
+  label50 = gtk_label_new_with_mnemonic (_("_Value:"));
+  gtk_widget_set_name (label50, "label50");
   gtk_widget_show (label50);
   gtk_box_pack_start (GTK_BOX (hbox6), label50, FALSE, FALSE, 0);
   gtk_label_set_justify (GTK_LABEL (label50), GTK_JUSTIFY_CENTER);
+  gtk_misc_set_padding (GTK_MISC (label50), 5, 0);
 
-  entry3 = gtk_entry_new ();
-  gtk_widget_show (entry3);
-  gtk_box_pack_start (GTK_BOX (hbox6), entry3, TRUE, TRUE, 0);
+  metaDataDialogValueEntry = gtk_entry_new ();
+  gtk_widget_set_name (metaDataDialogValueEntry, "metaDataDialogValueEntry");
+  gtk_widget_show (metaDataDialogValueEntry);
+  gtk_box_pack_start (GTK_BOX (hbox6), metaDataDialogValueEntry, TRUE, TRUE, 
0);
+  gtk_widget_add_accelerator (metaDataDialogValueEntry, "activate", 
accel_group,
+                              GDK_Return, 0,
+                              GTK_ACCEL_VISIBLE);
 
   frame12 = gtk_frame_new (NULL);
+  gtk_widget_set_name (frame12, "frame12");
   gtk_widget_show (frame12);
-  gtk_box_pack_start (GTK_BOX (vbox8), frame12, TRUE, TRUE, 0);
+  gtk_box_pack_start (GTK_BOX (dialog_vbox1), frame12, TRUE, TRUE, 0);
 
   scrolledwindow10 = gtk_scrolled_window_new (NULL, NULL);
+  gtk_widget_set_name (scrolledwindow10, "scrolledwindow10");
   gtk_widget_show (scrolledwindow10);
   gtk_container_add (GTK_CONTAINER (frame12), scrolledwindow10);
   GTK_WIDGET_UNSET_FLAGS (scrolledwindow10, GTK_CAN_FOCUS);
   gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow10), 
GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
   gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolledwindow10), 
GTK_SHADOW_IN);
 
-  clist8 = gtk_tree_view_new ();
-  gtk_widget_show (clist8);
-  gtk_container_add (GTK_CONTAINER (scrolledwindow10), clist8);
+  metaDataDialogMetaDataList = gtk_tree_view_new ();
+  gtk_widget_set_name (metaDataDialogMetaDataList, 
"metaDataDialogMetaDataList");
+  gtk_widget_show (metaDataDialogMetaDataList);
+  gtk_container_add (GTK_CONTAINER (scrolledwindow10), 
metaDataDialogMetaDataList);
+  gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (metaDataDialogMetaDataList), 
TRUE);
 
   label56 = gtk_label_new (_("Meta-data"));
+  gtk_widget_set_name (label56, "label56");
   gtk_widget_show (label56);
   gtk_frame_set_label_widget (GTK_FRAME (frame12), label56);
 
   hbox7 = gtk_hbox_new (FALSE, 0);
+  gtk_widget_set_name (hbox7, "hbox7");
   gtk_widget_show (hbox7);
-  gtk_box_pack_start (GTK_BOX (vbox8), hbox7, TRUE, TRUE, 0);
+  gtk_box_pack_start (GTK_BOX (dialog_vbox1), hbox7, TRUE, TRUE, 0);
 
-  label47 = gtk_label_new_with_mnemonic (_("_Keyword"));
+  label47 = gtk_label_new_with_mnemonic (_("_Keyword:"));
+  gtk_widget_set_name (label47, "label47");
   gtk_widget_show (label47);
   gtk_box_pack_start (GTK_BOX (hbox7), label47, FALSE, FALSE, 0);
   gtk_label_set_justify (GTK_LABEL (label47), GTK_JUSTIFY_CENTER);
+  gtk_misc_set_padding (GTK_MISC (label47), 5, 0);
 
-  entry4 = gtk_entry_new ();
-  gtk_widget_show (entry4);
-  gtk_box_pack_start (GTK_BOX (hbox7), entry4, TRUE, TRUE, 0);
+  fileInformationKeywordEntry = gtk_entry_new ();
+  gtk_widget_set_name (fileInformationKeywordEntry, 
"fileInformationKeywordEntry");
+  gtk_widget_show (fileInformationKeywordEntry);
+  gtk_box_pack_start (GTK_BOX (hbox7), fileInformationKeywordEntry, TRUE, 
TRUE, 0);
+  gtk_widget_add_accelerator (fileInformationKeywordEntry, "activate", 
accel_group,
+                              GDK_Return, 0,
+                              GTK_ACCEL_VISIBLE);
 
-  frame13 = gtk_frame_new (NULL);
-  gtk_widget_show (frame13);
-  gtk_box_pack_start (GTK_BOX (dialog_vbox1), frame13, TRUE, TRUE, 0);
+  metaDataDialogKeywordFrame = gtk_frame_new (NULL);
+  gtk_widget_set_name (metaDataDialogKeywordFrame, 
"metaDataDialogKeywordFrame");
+  gtk_widget_show (metaDataDialogKeywordFrame);
+  gtk_box_pack_start (GTK_BOX (dialog_vbox1), metaDataDialogKeywordFrame, 
TRUE, TRUE, 0);
 
-  scrolledwindow11 = gtk_scrolled_window_new (NULL, NULL);
-  gtk_widget_show (scrolledwindow11);
-  gtk_container_add (GTK_CONTAINER (frame13), scrolledwindow11);
-  GTK_WIDGET_UNSET_FLAGS (scrolledwindow11, GTK_CAN_FOCUS);
-  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow11), 
GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
-  gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolledwindow11), 
GTK_SHADOW_IN);
+  metaDataDialogKeywordScrolledWindow = gtk_scrolled_window_new (NULL, NULL);
+  gtk_widget_set_name (metaDataDialogKeywordScrolledWindow, 
"metaDataDialogKeywordScrolledWindow");
+  gtk_widget_show (metaDataDialogKeywordScrolledWindow);
+  gtk_container_add (GTK_CONTAINER (metaDataDialogKeywordFrame), 
metaDataDialogKeywordScrolledWindow);
+  GTK_WIDGET_UNSET_FLAGS (metaDataDialogKeywordScrolledWindow, GTK_CAN_FOCUS);
+  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW 
(metaDataDialogKeywordScrolledWindow), GTK_POLICY_AUTOMATIC, 
GTK_POLICY_AUTOMATIC);
+  gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW 
(metaDataDialogKeywordScrolledWindow), GTK_SHADOW_IN);
 
-  clist9 = gtk_tree_view_new ();
-  gtk_widget_show (clist9);
-  gtk_container_add (GTK_CONTAINER (scrolledwindow11), clist9);
+  metaDataDialogKeywordList = gtk_tree_view_new ();
+  gtk_widget_set_name (metaDataDialogKeywordList, "metaDataDialogKeywordList");
+  gtk_widget_show (metaDataDialogKeywordList);
+  gtk_container_add (GTK_CONTAINER (metaDataDialogKeywordScrolledWindow), 
metaDataDialogKeywordList);
+  gtk_tooltips_set_tip (tooltips, metaDataDialogKeywordList, _("Select entries 
and use Delete button in order to delete keywords."), NULL);
+  gtk_tree_view_set_headers_visible (GTK_TREE_VIEW 
(metaDataDialogKeywordList), FALSE);
+  gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (metaDataDialogKeywordList), 
TRUE);
 
   label57 = gtk_label_new (_("Keywords"));
+  gtk_widget_set_name (label57, "label57");
   gtk_widget_show (label57);
-  gtk_frame_set_label_widget (GTK_FRAME (frame13), label57);
+  gtk_frame_set_label_widget (GTK_FRAME (metaDataDialogKeywordFrame), label57);
 
-  dialog_action_area1 = GTK_DIALOG (metadatadialog)->action_area;
+  dialog_action_area1 = GTK_DIALOG (metaDataDialog)->action_area;
+  gtk_widget_set_name (dialog_action_area1, "dialog_action_area1");
   gtk_widget_show (dialog_action_area1);
-  gtk_button_box_set_layout (GTK_BUTTON_BOX (dialog_action_area1), 
GTK_BUTTONBOX_END);
+  gtk_button_box_set_layout (GTK_BUTTON_BOX (dialog_action_area1), 
GTK_BUTTONBOX_SPREAD);
 
-  button7 = gtk_button_new_with_mnemonic (_("_Done"));
-  gtk_widget_show (button7);
-  gtk_dialog_add_action_widget (GTK_DIALOG (metadatadialog), button7, 0);
+  metaDataDialogDeleteButton = gtk_button_new_from_stock ("gtk-delete");
+  gtk_widget_set_name (metaDataDialogDeleteButton, 
"metaDataDialogDeleteButton");
+  gtk_widget_show (metaDataDialogDeleteButton);
+  gtk_dialog_add_action_widget (GTK_DIALOG (metaDataDialog), 
metaDataDialogDeleteButton, 0);
+  gtk_widget_set_sensitive (metaDataDialogDeleteButton, FALSE);
+  GTK_WIDGET_SET_FLAGS (metaDataDialogDeleteButton, GTK_CAN_DEFAULT);
+  gtk_tooltips_set_tip (tooltips, metaDataDialogDeleteButton, _("Use this 
button to delete meta-data or keywords."), NULL);
+  gtk_widget_add_accelerator (metaDataDialogDeleteButton, "activate", 
accel_group,
+                              GDK_Delete, 0,
+                              GTK_ACCEL_VISIBLE);
 
+  metaDataDialogCancelButton = gtk_button_new_from_stock ("gtk-cancel");
+  gtk_widget_set_name (metaDataDialogCancelButton, 
"metaDataDialogCancelButton");
+  gtk_widget_show (metaDataDialogCancelButton);
+  gtk_dialog_add_action_widget (GTK_DIALOG (metaDataDialog), 
metaDataDialogCancelButton, GTK_RESPONSE_CANCEL);
+  GTK_WIDGET_SET_FLAGS (metaDataDialogCancelButton, GTK_CAN_DEFAULT);
+  gtk_widget_add_accelerator (metaDataDialogCancelButton, "activate", 
accel_group,
+                              GDK_Escape, 0,
+                              GTK_ACCEL_VISIBLE);
+
+  metaDataDialogApplyButton = gtk_button_new_from_stock ("gtk-apply");
+  gtk_widget_set_name (metaDataDialogApplyButton, "metaDataDialogApplyButton");
+  gtk_widget_show (metaDataDialogApplyButton);
+  gtk_dialog_add_action_widget (GTK_DIALOG (metaDataDialog), 
metaDataDialogApplyButton, GTK_RESPONSE_APPLY);
+  GTK_WIDGET_SET_FLAGS (metaDataDialogApplyButton, GTK_CAN_DEFAULT);
+  gtk_widget_add_accelerator (metaDataDialogApplyButton, "activate", 
accel_group,
+                              GDK_A, GDK_MOD1_MASK,
+                              GTK_ACCEL_VISIBLE);
+
+  g_signal_connect ((gpointer) metaDataDialog, "close",
+                    G_CALLBACK (on_metaDataDialog_close),
+                    NULL);
+  g_signal_connect_swapped ((gpointer) metaDataDialogValueEntry, 
"editing_done",
+                            G_CALLBACK 
(on_metaDataDialogValueEntry_editing_done),
+                            GTK_OBJECT (metaDataDialog));
+  g_signal_connect_swapped ((gpointer) metaDataDialogValueEntry, "activate",
+                            G_CALLBACK 
(on_metaDataDialogValueEntry_editing_done),
+                            GTK_OBJECT (metaDataDialog));
+  g_signal_connect_swapped ((gpointer) metaDataDialogMetaDataList, 
"select_cursor_row",
+                            G_CALLBACK 
(on_metaDataDialogMetaDataList_select_cursor_row),
+                            GTK_OBJECT (metaDataDialog));
+  g_signal_connect_swapped ((gpointer) fileInformationKeywordEntry, "activate",
+                            G_CALLBACK (fileInformationKeywordEntry_activate),
+                            GTK_OBJECT (metaDataDialog));
+  g_signal_connect_swapped ((gpointer) fileInformationKeywordEntry, 
"editing_done",
+                            G_CALLBACK (fileInformationKeywordEntry_activate),
+                            GTK_OBJECT (metaDataDialog));
+  g_signal_connect_swapped ((gpointer) metaDataDialogKeywordList, 
"select_cursor_row",
+                            G_CALLBACK 
(on_metaDataDialogKeywordList_select_cursor_row),
+                            GTK_OBJECT (metaDataDialog));
+  g_signal_connect ((gpointer) metaDataDialogDeleteButton, "activate",
+                    G_CALLBACK (on_metaDataDialogDeleteButton_activate),
+                    NULL);
+  g_signal_connect_swapped ((gpointer) metaDataDialogCancelButton, "clicked",
+                            G_CALLBACK (gtk_widget_destroy),
+                            GTK_OBJECT (metaDataDialog));
+  g_signal_connect_swapped ((gpointer) metaDataDialogCancelButton, "activate",
+                            G_CALLBACK (gtk_widget_destroy),
+                            GTK_OBJECT (metaDataDialog));
+  g_signal_connect_swapped ((gpointer) metaDataDialogApplyButton, "clicked",
+                            G_CALLBACK (on_metaDataDialogApplyButton_clicked),
+                            GTK_OBJECT (metaDataDialog));
+
   gtk_label_set_mnemonic_widget (GTK_LABEL (label49), optionmenu2);
-  gtk_label_set_mnemonic_widget (GTK_LABEL (label50), entry3);
-  gtk_label_set_mnemonic_widget (GTK_LABEL (label47), entry4);
+  gtk_label_set_mnemonic_widget (GTK_LABEL (label50), 
metaDataDialogValueEntry);
+  gtk_label_set_mnemonic_widget (GTK_LABEL (label47), 
fileInformationKeywordEntry);
 
+  atko = gtk_widget_get_accessible (metaDataDialog);
+  atk_object_set_name (atko, _("Edit File Information"));
+  atk_object_set_description (atko, _("This dialog is used to edit information 
about shared files."));
+
+  atko = gtk_widget_get_accessible (metaDataDialogValueEntry);
+  atk_object_set_name (atko, _("Value Entry"));
+  atk_object_set_description (atko, _("Enter the value for the meta-data of 
the specified type here.\nPress ENTER to add the data."));
+
+  atko = gtk_widget_get_accessible (metaDataDialogKeywordFrame);
+  atk_object_set_description (atko, _("Lists all of the keywords that will be 
used."));
+
+  atko = gtk_widget_get_accessible (metaDataDialogDeleteButton);
+  atk_object_set_name (atko, _("Delete button"));
+
+  atko = gtk_widget_get_accessible (metaDataDialogCancelButton);
+  atk_object_set_name (atko, _("metaDataDialogCancelButton"));
+  atk_object_set_description (atko, _("Abort the upload operation."));
+
+
   /* Store pointers to all widgets, for use by lookup_widget(). */
-  GLADE_HOOKUP_OBJECT_NO_REF (metadatadialog, metadatadialog, 
"metadatadialog");
-  GLADE_HOOKUP_OBJECT_NO_REF (metadatadialog, dialog_vbox1, "dialog_vbox1");
-  GLADE_HOOKUP_OBJECT (metadatadialog, vbox8, "vbox8");
-  GLADE_HOOKUP_OBJECT (metadatadialog, label51, "label51");
-  GLADE_HOOKUP_OBJECT (metadatadialog, hbox6, "hbox6");
-  GLADE_HOOKUP_OBJECT (metadatadialog, label49, "label49");
-  GLADE_HOOKUP_OBJECT (metadatadialog, optionmenu2, "optionmenu2");
-  GLADE_HOOKUP_OBJECT (metadatadialog, convertwidget30, "convertwidget30");
-  GLADE_HOOKUP_OBJECT (metadatadialog, convertwidget31, "convertwidget31");
-  GLADE_HOOKUP_OBJECT (metadatadialog, convertwidget32, "convertwidget32");
-  GLADE_HOOKUP_OBJECT (metadatadialog, convertwidget33, "convertwidget33");
-  GLADE_HOOKUP_OBJECT (metadatadialog, label50, "label50");
-  GLADE_HOOKUP_OBJECT (metadatadialog, entry3, "entry3");
-  GLADE_HOOKUP_OBJECT (metadatadialog, frame12, "frame12");
-  GLADE_HOOKUP_OBJECT (metadatadialog, scrolledwindow10, "scrolledwindow10");
-  GLADE_HOOKUP_OBJECT (metadatadialog, clist8, "clist8");
-  GLADE_HOOKUP_OBJECT (metadatadialog, label56, "label56");
-  GLADE_HOOKUP_OBJECT (metadatadialog, hbox7, "hbox7");
-  GLADE_HOOKUP_OBJECT (metadatadialog, label47, "label47");
-  GLADE_HOOKUP_OBJECT (metadatadialog, entry4, "entry4");
-  GLADE_HOOKUP_OBJECT (metadatadialog, frame13, "frame13");
-  GLADE_HOOKUP_OBJECT (metadatadialog, scrolledwindow11, "scrolledwindow11");
-  GLADE_HOOKUP_OBJECT (metadatadialog, clist9, "clist9");
-  GLADE_HOOKUP_OBJECT (metadatadialog, label57, "label57");
-  GLADE_HOOKUP_OBJECT_NO_REF (metadatadialog, dialog_action_area1, 
"dialog_action_area1");
-  GLADE_HOOKUP_OBJECT (metadatadialog, button7, "button7");
+  GLADE_HOOKUP_OBJECT_NO_REF (metaDataDialog, metaDataDialog, 
"metaDataDialog");
+  GLADE_HOOKUP_OBJECT_NO_REF (metaDataDialog, dialog_vbox1, "dialog_vbox1");
+  GLADE_HOOKUP_OBJECT (metaDataDialog, label51, "label51");
+  GLADE_HOOKUP_OBJECT (metaDataDialog, hbox6, "hbox6");
+  GLADE_HOOKUP_OBJECT (metaDataDialog, label49, "label49");
+  GLADE_HOOKUP_OBJECT (metaDataDialog, optionmenu2, "optionmenu2");
+  GLADE_HOOKUP_OBJECT (metaDataDialog, convertwidget30, "convertwidget30");
+  GLADE_HOOKUP_OBJECT (metaDataDialog, convertwidget31, "convertwidget31");
+  GLADE_HOOKUP_OBJECT (metaDataDialog, label50, "label50");
+  GLADE_HOOKUP_OBJECT (metaDataDialog, metaDataDialogValueEntry, 
"metaDataDialogValueEntry");
+  GLADE_HOOKUP_OBJECT (metaDataDialog, frame12, "frame12");
+  GLADE_HOOKUP_OBJECT (metaDataDialog, scrolledwindow10, "scrolledwindow10");
+  GLADE_HOOKUP_OBJECT (metaDataDialog, metaDataDialogMetaDataList, 
"metaDataDialogMetaDataList");
+  GLADE_HOOKUP_OBJECT (metaDataDialog, label56, "label56");
+  GLADE_HOOKUP_OBJECT (metaDataDialog, hbox7, "hbox7");
+  GLADE_HOOKUP_OBJECT (metaDataDialog, label47, "label47");
+  GLADE_HOOKUP_OBJECT (metaDataDialog, fileInformationKeywordEntry, 
"fileInformationKeywordEntry");
+  GLADE_HOOKUP_OBJECT (metaDataDialog, metaDataDialogKeywordFrame, 
"metaDataDialogKeywordFrame");
+  GLADE_HOOKUP_OBJECT (metaDataDialog, metaDataDialogKeywordScrolledWindow, 
"metaDataDialogKeywordScrolledWindow");
+  GLADE_HOOKUP_OBJECT (metaDataDialog, metaDataDialogKeywordList, 
"metaDataDialogKeywordList");
+  GLADE_HOOKUP_OBJECT (metaDataDialog, label57, "label57");
+  GLADE_HOOKUP_OBJECT_NO_REF (metaDataDialog, dialog_action_area1, 
"dialog_action_area1");
+  GLADE_HOOKUP_OBJECT (metaDataDialog, metaDataDialogDeleteButton, 
"metaDataDialogDeleteButton");
+  GLADE_HOOKUP_OBJECT (metaDataDialog, metaDataDialogCancelButton, 
"metaDataDialogCancelButton");
+  GLADE_HOOKUP_OBJECT (metaDataDialog, metaDataDialogApplyButton, 
"metaDataDialogApplyButton");
+  GLADE_HOOKUP_OBJECT_NO_REF (metaDataDialog, tooltips, "tooltips");
 
-  return metadatadialog;
+  gtk_window_add_accel_group (GTK_WINDOW (metaDataDialog), accel_group);
+
+  return metaDataDialog;
 }
 
 GtkWidget*
 create_metaDisplayDialog (void)
 {
   GtkWidget *metaDisplayDialog;
+  GdkPixbuf *metaDisplayDialog_icon_pixbuf;
   GtkWidget *dialog_vbox2;
   GtkWidget *frame14;
   GtkWidget *scrolledwindow12;
   GtkWidget *clist10;
   GtkWidget *label58;
   GtkWidget *dialog_action_area2;
-  GtkWidget *doneButton;
+  GtkWidget *fileInformationDoneButton;
+  GtkAccelGroup *accel_group;
 
+  accel_group = gtk_accel_group_new ();
+
   metaDisplayDialog = gtk_dialog_new ();
+  gtk_widget_set_name (metaDisplayDialog, "metaDisplayDialog");
   gtk_window_set_title (GTK_WINDOW (metaDisplayDialog), _("File Information"));
-  GTK_WINDOW (metaDisplayDialog)->type = GTK_WINDOW_POPUP;
+  gtk_window_set_modal (GTK_WINDOW (metaDisplayDialog), TRUE);
+  metaDisplayDialog_icon_pixbuf = create_pixbuf ("info.png");
+  if (metaDisplayDialog_icon_pixbuf)
+    {
+      gtk_window_set_icon (GTK_WINDOW (metaDisplayDialog), 
metaDisplayDialog_icon_pixbuf);
+      gdk_pixbuf_unref (metaDisplayDialog_icon_pixbuf);
+    }
   gtk_window_set_type_hint (GTK_WINDOW (metaDisplayDialog), 
GDK_WINDOW_TYPE_HINT_DIALOG);
 
   dialog_vbox2 = GTK_DIALOG (metaDisplayDialog)->vbox;
+  gtk_widget_set_name (dialog_vbox2, "dialog_vbox2");
   gtk_widget_show (dialog_vbox2);
 
   frame14 = gtk_frame_new (NULL);
+  gtk_widget_set_name (frame14, "frame14");
   gtk_widget_show (frame14);
   gtk_box_pack_start (GTK_BOX (dialog_vbox2), frame14, TRUE, TRUE, 0);
 
   scrolledwindow12 = gtk_scrolled_window_new (NULL, NULL);
+  gtk_widget_set_name (scrolledwindow12, "scrolledwindow12");
   gtk_widget_show (scrolledwindow12);
   gtk_container_add (GTK_CONTAINER (frame14), scrolledwindow12);
   GTK_WIDGET_UNSET_FLAGS (scrolledwindow12, GTK_CAN_FOCUS);
@@ -1033,21 +1417,38 @@
   gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolledwindow12), 
GTK_SHADOW_IN);
 
   clist10 = gtk_tree_view_new ();
+  gtk_widget_set_name (clist10, "clist10");
   gtk_widget_show (clist10);
   gtk_container_add (GTK_CONTAINER (scrolledwindow12), clist10);
 
   label58 = gtk_label_new (_("Meta-data"));
+  gtk_widget_set_name (label58, "label58");
   gtk_widget_show (label58);
   gtk_frame_set_label_widget (GTK_FRAME (frame14), label58);
 
   dialog_action_area2 = GTK_DIALOG (metaDisplayDialog)->action_area;
+  gtk_widget_set_name (dialog_action_area2, "dialog_action_area2");
   gtk_widget_show (dialog_action_area2);
   gtk_button_box_set_layout (GTK_BUTTON_BOX (dialog_action_area2), 
GTK_BUTTONBOX_END);
 
-  doneButton = gtk_button_new_with_mnemonic (_("Done"));
-  gtk_widget_show (doneButton);
-  gtk_dialog_add_action_widget (GTK_DIALOG (metaDisplayDialog), doneButton, 0);
+  fileInformationDoneButton = gtk_button_new_from_stock ("gtk-ok");
+  gtk_widget_set_name (fileInformationDoneButton, "fileInformationDoneButton");
+  gtk_widget_show (fileInformationDoneButton);
+  gtk_dialog_add_action_widget (GTK_DIALOG (metaDisplayDialog), 
fileInformationDoneButton, GTK_RESPONSE_OK);
+  gtk_widget_add_accelerator (fileInformationDoneButton, "activate", 
accel_group,
+                              GDK_Escape, 0,
+                              GTK_ACCEL_VISIBLE);
+  gtk_widget_add_accelerator (fileInformationDoneButton, "activate", 
accel_group,
+                              GDK_Return, 0,
+                              GTK_ACCEL_VISIBLE);
 
+  g_signal_connect_swapped ((gpointer) fileInformationDoneButton, "clicked",
+                            G_CALLBACK (gtk_widget_destroy),
+                            GTK_OBJECT (metaDisplayDialog));
+  g_signal_connect_swapped ((gpointer) fileInformationDoneButton, "activate",
+                            G_CALLBACK (gtk_widget_destroy),
+                            GTK_OBJECT (metaDisplayDialog));
+
   /* Store pointers to all widgets, for use by lookup_widget(). */
   GLADE_HOOKUP_OBJECT_NO_REF (metaDisplayDialog, metaDisplayDialog, 
"metaDisplayDialog");
   GLADE_HOOKUP_OBJECT_NO_REF (metaDisplayDialog, dialog_vbox2, "dialog_vbox2");
@@ -1056,8 +1457,10 @@
   GLADE_HOOKUP_OBJECT (metaDisplayDialog, clist10, "clist10");
   GLADE_HOOKUP_OBJECT (metaDisplayDialog, label58, "label58");
   GLADE_HOOKUP_OBJECT_NO_REF (metaDisplayDialog, dialog_action_area2, 
"dialog_action_area2");
-  GLADE_HOOKUP_OBJECT (metaDisplayDialog, doneButton, "doneButton");
+  GLADE_HOOKUP_OBJECT (metaDisplayDialog, fileInformationDoneButton, 
"fileInformationDoneButton");
 
+  gtk_window_add_accel_group (GTK_WINDOW (metaDisplayDialog), accel_group);
+
   return metaDisplayDialog;
 }
 
@@ -1075,52 +1478,73 @@
   GtkWidget *hbox13;
   GtkWidget *image3;
   GtkWidget *label65;
+  GtkAccelGroup *accel_group;
 
+  accel_group = gtk_accel_group_new ();
+
   searchResultsFrame = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  gtk_widget_set_name (searchResultsFrame, "searchResultsFrame");
   gtk_window_set_title (GTK_WINDOW (searchResultsFrame), _("Search Results"));
 
   scrolledwindow14 = gtk_scrolled_window_new (NULL, NULL);
+  gtk_widget_set_name (scrolledwindow14, "scrolledwindow14");
   gtk_widget_show (scrolledwindow14);
   gtk_container_add (GTK_CONTAINER (searchResultsFrame), scrolledwindow14);
   gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow14), 
GTK_POLICY_NEVER, GTK_POLICY_NEVER);
 
   viewport5 = gtk_viewport_new (NULL, NULL);
+  gtk_widget_set_name (viewport5, "viewport5");
   gtk_widget_show (viewport5);
   gtk_container_add (GTK_CONTAINER (scrolledwindow14), viewport5);
 
   vbox11 = gtk_vbox_new (FALSE, 0);
+  gtk_widget_set_name (vbox11, "vbox11");
   gtk_widget_show (vbox11);
   gtk_container_add (GTK_CONTAINER (viewport5), vbox11);
 
   scrolledwindow15 = gtk_scrolled_window_new (NULL, NULL);
+  gtk_widget_set_name (scrolledwindow15, "scrolledwindow15");
   gtk_widget_show (scrolledwindow15);
   gtk_box_pack_start (GTK_BOX (vbox11), scrolledwindow15, TRUE, TRUE, 0);
   gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolledwindow15), 
GTK_SHADOW_IN);
 
   searchResults = gtk_tree_view_new ();
+  gtk_widget_set_name (searchResults, "searchResults");
   gtk_widget_show (searchResults);
   gtk_container_add (GTK_CONTAINER (scrolledwindow15), searchResults);
 
   downloadButton = gtk_button_new ();
+  gtk_widget_set_name (downloadButton, "downloadButton");
   gtk_widget_show (downloadButton);
   gtk_box_pack_start (GTK_BOX (vbox11), downloadButton, FALSE, FALSE, 0);
+  gtk_widget_add_accelerator (downloadButton, "activate", accel_group,
+                              GDK_Return, GDK_CONTROL_MASK,
+                              GTK_ACCEL_VISIBLE);
 
   alignment3 = gtk_alignment_new (0.5, 0.5, 0, 0);
+  gtk_widget_set_name (alignment3, "alignment3");
   gtk_widget_show (alignment3);
   gtk_container_add (GTK_CONTAINER (downloadButton), alignment3);
 
   hbox13 = gtk_hbox_new (FALSE, 2);
+  gtk_widget_set_name (hbox13, "hbox13");
   gtk_widget_show (hbox13);
   gtk_container_add (GTK_CONTAINER (alignment3), hbox13);
 
   image3 = gtk_image_new_from_stock ("gtk-copy", GTK_ICON_SIZE_BUTTON);
+  gtk_widget_set_name (image3, "image3");
   gtk_widget_show (image3);
   gtk_box_pack_start (GTK_BOX (hbox13), image3, FALSE, FALSE, 0);
 
   label65 = gtk_label_new_with_mnemonic (_("_Download"));
+  gtk_widget_set_name (label65, "label65");
   gtk_widget_show (label65);
   gtk_box_pack_start (GTK_BOX (hbox13), label65, FALSE, FALSE, 0);
 
+  g_signal_connect_swapped ((gpointer) downloadButton, "clicked",
+                            G_CALLBACK (on_downloadButton_clicked),
+                            GTK_OBJECT (searchResults));
+
   /* Store pointers to all widgets, for use by lookup_widget(). */
   GLADE_HOOKUP_OBJECT_NO_REF (searchResultsFrame, searchResultsFrame, 
"searchResultsFrame");
   GLADE_HOOKUP_OBJECT (searchResultsFrame, scrolledwindow14, 
"scrolledwindow14");
@@ -1134,6 +1558,8 @@
   GLADE_HOOKUP_OBJECT (searchResultsFrame, image3, "image3");
   GLADE_HOOKUP_OBJECT (searchResultsFrame, label65, "label65");
 
+  gtk_window_add_accel_group (GTK_WINDOW (searchResultsFrame), accel_group);
+
   return searchResultsFrame;
 }
 
@@ -1143,91 +1569,119 @@
   GtkWidget *namespaceContentFrame;
   GtkWidget *vbox12;
   GtkWidget *scrolledwindow16;
-  GtkWidget *treeview2;
+  GtkWidget *namespaceContentFrameTreeView;
   GtkWidget *hbox14;
-  GtkWidget *button14;
+  GtkWidget *namespaceInsertButton;
   GtkWidget *alignment4;
   GtkWidget *hbox15;
   GtkWidget *image4;
   GtkWidget *label66;
-  GtkWidget *button15;
+  GtkWidget *namespaceUpdateButton;
   GtkWidget *alignment5;
   GtkWidget *hbox16;
   GtkWidget *image5;
   GtkWidget *label67;
 
   namespaceContentFrame = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  gtk_widget_set_name (namespaceContentFrame, "namespaceContentFrame");
   gtk_window_set_title (GTK_WINDOW (namespaceContentFrame), _("Namespace 
Contents"));
 
   vbox12 = gtk_vbox_new (FALSE, 0);
+  gtk_widget_set_name (vbox12, "vbox12");
   gtk_widget_show (vbox12);
   gtk_container_add (GTK_CONTAINER (namespaceContentFrame), vbox12);
 
   scrolledwindow16 = gtk_scrolled_window_new (NULL, NULL);
+  gtk_widget_set_name (scrolledwindow16, "scrolledwindow16");
   gtk_widget_show (scrolledwindow16);
   gtk_box_pack_start (GTK_BOX (vbox12), scrolledwindow16, TRUE, TRUE, 0);
   gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolledwindow16), 
GTK_SHADOW_IN);
 
-  treeview2 = gtk_tree_view_new ();
-  gtk_widget_show (treeview2);
-  gtk_container_add (GTK_CONTAINER (scrolledwindow16), treeview2);
+  namespaceContentFrameTreeView = gtk_tree_view_new ();
+  gtk_widget_set_name (namespaceContentFrameTreeView, 
"namespaceContentFrameTreeView");
+  gtk_widget_show (namespaceContentFrameTreeView);
+  gtk_container_add (GTK_CONTAINER (scrolledwindow16), 
namespaceContentFrameTreeView);
 
   hbox14 = gtk_hbox_new (FALSE, 0);
+  gtk_widget_set_name (hbox14, "hbox14");
   gtk_widget_show (hbox14);
   gtk_box_pack_start (GTK_BOX (vbox12), hbox14, TRUE, TRUE, 0);
 
-  button14 = gtk_button_new ();
-  gtk_widget_show (button14);
-  gtk_box_pack_start (GTK_BOX (hbox14), button14, TRUE, TRUE, 0);
+  namespaceInsertButton = gtk_button_new ();
+  gtk_widget_set_name (namespaceInsertButton, "namespaceInsertButton");
+  gtk_widget_show (namespaceInsertButton);
+  gtk_box_pack_start (GTK_BOX (hbox14), namespaceInsertButton, TRUE, TRUE, 0);
 
   alignment4 = gtk_alignment_new (0.5, 0.5, 0, 0);
+  gtk_widget_set_name (alignment4, "alignment4");
   gtk_widget_show (alignment4);
-  gtk_container_add (GTK_CONTAINER (button14), alignment4);
+  gtk_container_add (GTK_CONTAINER (namespaceInsertButton), alignment4);
 
   hbox15 = gtk_hbox_new (FALSE, 2);
+  gtk_widget_set_name (hbox15, "hbox15");
   gtk_widget_show (hbox15);
   gtk_container_add (GTK_CONTAINER (alignment4), hbox15);
 
   image4 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_BUTTON);
+  gtk_widget_set_name (image4, "image4");
   gtk_widget_show (image4);
   gtk_box_pack_start (GTK_BOX (hbox15), image4, FALSE, FALSE, 0);
 
   label66 = gtk_label_new_with_mnemonic (_("_Insert"));
+  gtk_widget_set_name (label66, "label66");
   gtk_widget_show (label66);
   gtk_box_pack_start (GTK_BOX (hbox15), label66, FALSE, FALSE, 0);
 
-  button15 = gtk_button_new ();
-  gtk_widget_show (button15);
-  gtk_box_pack_start (GTK_BOX (hbox14), button15, TRUE, TRUE, 0);
+  namespaceUpdateButton = gtk_button_new ();
+  gtk_widget_set_name (namespaceUpdateButton, "namespaceUpdateButton");
+  gtk_widget_show (namespaceUpdateButton);
+  gtk_box_pack_start (GTK_BOX (hbox14), namespaceUpdateButton, TRUE, TRUE, 0);
+  gtk_widget_set_sensitive (namespaceUpdateButton, FALSE);
+  gtk_button_set_focus_on_click (GTK_BUTTON (namespaceUpdateButton), FALSE);
 
   alignment5 = gtk_alignment_new (0.5, 0.5, 0, 0);
+  gtk_widget_set_name (alignment5, "alignment5");
   gtk_widget_show (alignment5);
-  gtk_container_add (GTK_CONTAINER (button15), alignment5);
+  gtk_container_add (GTK_CONTAINER (namespaceUpdateButton), alignment5);
+  gtk_widget_set_sensitive (alignment5, FALSE);
 
   hbox16 = gtk_hbox_new (FALSE, 2);
+  gtk_widget_set_name (hbox16, "hbox16");
   gtk_widget_show (hbox16);
   gtk_container_add (GTK_CONTAINER (alignment5), hbox16);
 
   image5 = gtk_image_new_from_stock ("gtk-redo", GTK_ICON_SIZE_BUTTON);
+  gtk_widget_set_name (image5, "image5");
   gtk_widget_show (image5);
   gtk_box_pack_start (GTK_BOX (hbox16), image5, FALSE, FALSE, 0);
 
   label67 = gtk_label_new_with_mnemonic (_("_Update"));
+  gtk_widget_set_name (label67, "label67");
   gtk_widget_show (label67);
   gtk_box_pack_start (GTK_BOX (hbox16), label67, FALSE, FALSE, 0);
 
+  g_signal_connect_swapped ((gpointer) namespaceContentFrameTreeView, 
"select_cursor_row",
+                            G_CALLBACK 
(on_namespaceContentFrameTreeView_select_cursor_row),
+                            GTK_OBJECT (namespaceContentFrame));
+  g_signal_connect_swapped ((gpointer) namespaceInsertButton, "clicked",
+                            G_CALLBACK (on_namespaceInsertButton_activate),
+                            GTK_OBJECT (namespaceContentFrame));
+  g_signal_connect_swapped ((gpointer) namespaceUpdateButton, "clicked",
+                            G_CALLBACK (on_namespaceUpdateButton_clicked),
+                            GTK_OBJECT (namespaceContentFrameTreeView));
+
   /* Store pointers to all widgets, for use by lookup_widget(). */
   GLADE_HOOKUP_OBJECT_NO_REF (namespaceContentFrame, namespaceContentFrame, 
"namespaceContentFrame");
   GLADE_HOOKUP_OBJECT (namespaceContentFrame, vbox12, "vbox12");
   GLADE_HOOKUP_OBJECT (namespaceContentFrame, scrolledwindow16, 
"scrolledwindow16");
-  GLADE_HOOKUP_OBJECT (namespaceContentFrame, treeview2, "treeview2");
+  GLADE_HOOKUP_OBJECT (namespaceContentFrame, namespaceContentFrameTreeView, 
"namespaceContentFrameTreeView");
   GLADE_HOOKUP_OBJECT (namespaceContentFrame, hbox14, "hbox14");
-  GLADE_HOOKUP_OBJECT (namespaceContentFrame, button14, "button14");
+  GLADE_HOOKUP_OBJECT (namespaceContentFrame, namespaceInsertButton, 
"namespaceInsertButton");
   GLADE_HOOKUP_OBJECT (namespaceContentFrame, alignment4, "alignment4");
   GLADE_HOOKUP_OBJECT (namespaceContentFrame, hbox15, "hbox15");
   GLADE_HOOKUP_OBJECT (namespaceContentFrame, image4, "image4");
   GLADE_HOOKUP_OBJECT (namespaceContentFrame, label66, "label66");
-  GLADE_HOOKUP_OBJECT (namespaceContentFrame, button15, "button15");
+  GLADE_HOOKUP_OBJECT (namespaceContentFrame, namespaceUpdateButton, 
"namespaceUpdateButton");
   GLADE_HOOKUP_OBJECT (namespaceContentFrame, alignment5, "alignment5");
   GLADE_HOOKUP_OBJECT (namespaceContentFrame, hbox16, "hbox16");
   GLADE_HOOKUP_OBJECT (namespaceContentFrame, image5, "image5");
@@ -1243,10 +1697,9 @@
   GtkWidget *hbox17;
   GtkWidget *vbox13;
   GtkWidget *scrolledwindow18;
-  GtkWidget *textview1;
-  GtkWidget *vbox14;
+  GtkWidget *chatLogViewer;
   GtkWidget *hbox18;
-  GtkWidget *comboboxentry1;
+  GtkWidget *chatLineTextEntry;
   GtkWidget *chatSendButton;
   GtkWidget *alignment6;
   GtkWidget *hbox19;
@@ -1254,79 +1707,105 @@
   GtkWidget *label69;
   GtkWidget *scrolledwindow17;
   GtkWidget *treeview3;
+  GtkAccelGroup *accel_group;
 
+  accel_group = gtk_accel_group_new ();
+
   chatFrame = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  gtk_widget_set_name (chatFrame, "chatFrame");
   gtk_window_set_title (GTK_WINDOW (chatFrame), _("Chat"));
 
   hbox17 = gtk_hbox_new (FALSE, 0);
+  gtk_widget_set_name (hbox17, "hbox17");
   gtk_widget_show (hbox17);
   gtk_container_add (GTK_CONTAINER (chatFrame), hbox17);
 
   vbox13 = gtk_vbox_new (FALSE, 0);
+  gtk_widget_set_name (vbox13, "vbox13");
   gtk_widget_show (vbox13);
   gtk_box_pack_start (GTK_BOX (hbox17), vbox13, TRUE, TRUE, 0);
 
   scrolledwindow18 = gtk_scrolled_window_new (NULL, NULL);
+  gtk_widget_set_name (scrolledwindow18, "scrolledwindow18");
   gtk_widget_show (scrolledwindow18);
   gtk_box_pack_start (GTK_BOX (vbox13), scrolledwindow18, TRUE, TRUE, 0);
   gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow18), 
GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
   gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolledwindow18), 
GTK_SHADOW_IN);
 
-  textview1 = gtk_text_view_new ();
-  gtk_widget_show (textview1);
-  gtk_container_add (GTK_CONTAINER (scrolledwindow18), textview1);
+  chatLogViewer = gtk_text_view_new ();
+  gtk_widget_set_name (chatLogViewer, "chatLogViewer");
+  gtk_widget_show (chatLogViewer);
+  gtk_container_add (GTK_CONTAINER (scrolledwindow18), chatLogViewer);
 
-  vbox14 = gtk_vbox_new (FALSE, 0);
-  gtk_widget_show (vbox14);
-  gtk_box_pack_start (GTK_BOX (vbox13), vbox14, TRUE, TRUE, 0);
-
   hbox18 = gtk_hbox_new (FALSE, 0);
+  gtk_widget_set_name (hbox18, "hbox18");
   gtk_widget_show (hbox18);
-  gtk_box_pack_start (GTK_BOX (vbox14), hbox18, TRUE, TRUE, 0);
+  gtk_box_pack_start (GTK_BOX (vbox13), hbox18, FALSE, FALSE, 0);
 
-  comboboxentry1 = gtk_combo_box_entry_new_text ();
-  gtk_widget_show (comboboxentry1);
-  gtk_box_pack_start (GTK_BOX (hbox18), comboboxentry1, TRUE, TRUE, 0);
+  chatLineTextEntry = gtk_combo_box_entry_new_text ();
+  gtk_widget_set_name (chatLineTextEntry, "chatLineTextEntry");
+  gtk_widget_show (chatLineTextEntry);
+  gtk_box_pack_start (GTK_BOX (hbox18), chatLineTextEntry, TRUE, TRUE, 0);
+  gtk_combo_box_append_text (GTK_COMBO_BOX (chatLineTextEntry), _("/join 
#gnunet"));
 
   chatSendButton = gtk_button_new ();
+  gtk_widget_set_name (chatSendButton, "chatSendButton");
   gtk_widget_show (chatSendButton);
   gtk_box_pack_start (GTK_BOX (hbox18), chatSendButton, FALSE, FALSE, 0);
+  gtk_widget_add_accelerator (chatSendButton, "activate", accel_group,
+                              GDK_Return, GDK_CONTROL_MASK,
+                              GTK_ACCEL_VISIBLE);
 
   alignment6 = gtk_alignment_new (0.5, 0.5, 0, 0);
+  gtk_widget_set_name (alignment6, "alignment6");
   gtk_widget_show (alignment6);
   gtk_container_add (GTK_CONTAINER (chatSendButton), alignment6);
 
   hbox19 = gtk_hbox_new (FALSE, 2);
+  gtk_widget_set_name (hbox19, "hbox19");
   gtk_widget_show (hbox19);
   gtk_container_add (GTK_CONTAINER (alignment6), hbox19);
 
   image6 = gtk_image_new_from_stock ("gtk-ok", GTK_ICON_SIZE_BUTTON);
+  gtk_widget_set_name (image6, "image6");
   gtk_widget_show (image6);
   gtk_box_pack_start (GTK_BOX (hbox19), image6, FALSE, FALSE, 0);
 
   label69 = gtk_label_new_with_mnemonic (_("Senden"));
+  gtk_widget_set_name (label69, "label69");
   gtk_widget_show (label69);
   gtk_box_pack_start (GTK_BOX (hbox19), label69, FALSE, FALSE, 0);
 
   scrolledwindow17 = gtk_scrolled_window_new (NULL, NULL);
+  gtk_widget_set_name (scrolledwindow17, "scrolledwindow17");
   gtk_widget_show (scrolledwindow17);
   gtk_box_pack_start (GTK_BOX (hbox17), scrolledwindow17, TRUE, TRUE, 0);
   gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow17), 
GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
   gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolledwindow17), 
GTK_SHADOW_IN);
 
   treeview3 = gtk_tree_view_new ();
+  gtk_widget_set_name (treeview3, "treeview3");
   gtk_widget_show (treeview3);
   gtk_container_add (GTK_CONTAINER (scrolledwindow17), treeview3);
 
+  g_signal_connect ((gpointer) chatLineTextEntry, "editing_done",
+                    G_CALLBACK (on_chatLineTextEntry_editing_done),
+                    NULL);
+  g_signal_connect_swapped ((gpointer) chatSendButton, "activate",
+                            G_CALLBACK (on_chatSendButton_clicked),
+                            GTK_OBJECT (chatFrame));
+  g_signal_connect_swapped ((gpointer) chatSendButton, "clicked",
+                            G_CALLBACK (on_chatSendButton_clicked),
+                            GTK_OBJECT (chatFrame));
+
   /* Store pointers to all widgets, for use by lookup_widget(). */
   GLADE_HOOKUP_OBJECT_NO_REF (chatFrame, chatFrame, "chatFrame");
   GLADE_HOOKUP_OBJECT (chatFrame, hbox17, "hbox17");
   GLADE_HOOKUP_OBJECT (chatFrame, vbox13, "vbox13");
   GLADE_HOOKUP_OBJECT (chatFrame, scrolledwindow18, "scrolledwindow18");
-  GLADE_HOOKUP_OBJECT (chatFrame, textview1, "textview1");
-  GLADE_HOOKUP_OBJECT (chatFrame, vbox14, "vbox14");
+  GLADE_HOOKUP_OBJECT (chatFrame, chatLogViewer, "chatLogViewer");
   GLADE_HOOKUP_OBJECT (chatFrame, hbox18, "hbox18");
-  GLADE_HOOKUP_OBJECT (chatFrame, comboboxentry1, "comboboxentry1");
+  GLADE_HOOKUP_OBJECT (chatFrame, chatLineTextEntry, "chatLineTextEntry");
   GLADE_HOOKUP_OBJECT (chatFrame, chatSendButton, "chatSendButton");
   GLADE_HOOKUP_OBJECT (chatFrame, alignment6, "alignment6");
   GLADE_HOOKUP_OBJECT (chatFrame, hbox19, "hbox19");
@@ -1335,6 +1814,8 @@
   GLADE_HOOKUP_OBJECT (chatFrame, scrolledwindow17, "scrolledwindow17");
   GLADE_HOOKUP_OBJECT (chatFrame, treeview3, "treeview3");
 
+  gtk_window_add_accel_group (GTK_WINDOW (chatFrame), accel_group);
+
   return chatFrame;
 }
 

Modified: gnunet-gtk/src/interface.h
===================================================================
--- gnunet-gtk/src/interface.h  2005-05-24 11:18:12 UTC (rev 806)
+++ gnunet-gtk/src/interface.h  2005-05-24 11:20:25 UTC (rev 807)
@@ -3,7 +3,7 @@
  */
 
 GtkWidget* create_mainWindow (void);
-GtkWidget* create_metadatadialog (void);
+GtkWidget* create_metaDataDialog (void);
 GtkWidget* create_metaDisplayDialog (void);
 GtkWidget* create_searchResultsFrame (void);
 GtkWidget* create_namespaceContentFrame (void);

Modified: gnunet-gtk/src/main.c
===================================================================
--- gnunet-gtk/src/main.c       2005-05-24 11:18:12 UTC (rev 806)
+++ gnunet-gtk/src/main.c       2005-05-24 11:20:25 UTC (rev 807)
@@ -1,47 +1,125 @@
 /*
- * Initial main.c file generated by Glade. Edit as required.
- * Glade will not overwrite this file.
- */
+     This file is part of GNUnet.
+     (C) 2005 Christian Grothoff (and other contributing authors)
 
+     GNUnet is free software; you can redistribute it and/or modify
+     it under the terms of the GNU General Public License as published
+     by the Free Software Foundation; either version 2, or (at your
+     option) any later version.
+
+     GNUnet is distributed in the hope that it will be useful, but
+     WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     General Public License for more details.
+
+     You should have received a copy of the GNU General Public License
+     along with GNUnet; see the file COPYING.  If not, write to the
+     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+     Boston, MA 02111-1307, USA.
+*/
+
 #ifdef HAVE_CONFIG_H
 #  include <config.h>
 #endif
 
+#include "gettext.h"
+
 #include <gtk/gtk.h>
 
+#include <GNUnet/gnunet_util.h>
+#include <GNUnet/gnunet_ecrs_lib.h>
+
 #include "interface.h"
 #include "support.h"
 
+
+
+/**
+ * Prints the usage information for this command if the user errs.
+ * Aborts the program.
+ */
+static void printhelp() {
+  static Help help[] = {
+    HELP_CONFIG,
+    HELP_HELP,
+    HELP_HOSTNAME,
+    HELP_LOGLEVEL,
+    HELP_VERSION,
+    HELP_END,
+  };
+  formatHelp("gnunet-gtk [OPTIONS]",
+            _("GNUnet GTK user interface."),
+            help);
+}
+
+/**
+ * Parse the options, set the timeout.
+ * @param argc the number of options
+ * @param argv the option list (including keywords)
+ * @return SYSERR if we should exit, OK otherwise
+ */
+static int parseOptions(int argc,
+                       char ** argv) {
+  int c;
+
+  while (1) {
+    int option_index = 0;
+    static struct GNoption long_options[] = {
+      LONG_DEFAULT_OPTIONS,
+      { 0,0,0,0 }
+    };
+    c = GNgetopt_long(argc,
+                     argv,
+                     "c:dhH:L:v",
+                     long_options,
+                     &option_index);
+    if (c == -1)
+      break;  /* No more flags to process */
+    if (YES == parseDefaultOptions(c, GNoptarg))
+      continue;
+    switch(c) {
+    case 'h':
+      printhelp();
+      return SYSERR;
+    case 'v':
+      printf("GNUnet v%s, gnunet-gtk v%s\n",
+            VERSION,
+            AFS_VERSION);
+      return SYSERR;
+    default:
+      LOG(LOG_FAILURE,
+         _("Use --help to get a list of options.\n"));
+      return SYSERR;
+    } /* end of parsing commandline */
+  } /* while (1) */
+  setConfigurationStringList(&argv[GNoptind],
+                            argc-GNoptind);
+  return OK;
+}
+
+
 int
 main (int argc, char *argv[])
 {
-  GtkWidget *mainWindow;
-  GtkWidget *metadatadialog;
-  GtkWidget *metaDisplayDialog;
+  GtkWidget * mainWindow;
+  GtkWidget * metaDataDialog;
+  GtkWidget * metaDisplayDialog;
 
 #ifdef ENABLE_NLS
   bindtextdomain (PACKAGE, PACKAGE_LOCALE_DIR);
+  bind_textdomain_codeset (PACKAGE, "UTF-8");
   textdomain (PACKAGE);
 #endif
 
   gtk_set_locale ();
-  gtk_init (&argc, &argv);
-
+  gtk_init(&argc, &argv);
+  if (SYSERR == initUtil(argc, argv, &parseOptions)) 
+    return 0; /* parse error, --help, etc. */
+  
   add_pixmap_directory (PACKAGE_DATA_DIR "/pixmaps");
-  add_pixmap_directory (PACKAGE_SOURCE_DIR "/pixmaps");
 
-  /*
-   * The following code was added by Glade to create one of each component
-   * (except popup menus), just so that you see something after building
-   * the project. Delete any components that you don't want shown initially.
-   */
   mainWindow = create_mainWindow ();
   gtk_widget_show (mainWindow);
-  metadatadialog = create_metadatadialog ();
-  gtk_widget_show (metadatadialog);
-  metaDisplayDialog = create_metaDisplayDialog ();
-  gtk_widget_show (metaDisplayDialog);
-
   gtk_main ();
   return 0;
 }

Deleted: gnunet-gtk/strings.txt
===================================================================
--- gnunet-gtk/strings.txt      2005-05-24 11:18:12 UTC (rev 806)
+++ gnunet-gtk/strings.txt      2005-05-24 11:20:25 UTC (rev 807)
@@ -1,80 +0,0 @@
-/*
- * Translatable strings file generated by Glade.
- * Add this file to your project's POTFILES.in.
- * DO NOT compile it as part of your application.
- */
-
-gchar *s = N_("gnunet-gtk");
-gchar *s = N_("_Quit");
-gchar *s = N_("_Help");
-gchar *s = N_("_About");
-gchar *s = N_("_start gnunetd");
-gchar *s = N_("disconnect from GNUnet");
-gchar *s = N_("s_top gnunetd");
-gchar *s = N_("status");
-gchar *s = N_("gnunetd status");
-gchar *s = N_("gnunetd control");
-gchar *s = N_("Unavailable.\n"
-              "");
-gchar *s = N_("Statistics");
-gchar *s = N_("Available Applications");
-gchar *s = N_("_General");
-gchar *s = N_("Search Results");
-gchar *s = N_("Downloads");
-gchar *s = N_("Uploads");
-gchar *s = N_("S_tatus");
-gchar *s = N_("label61");
-gchar *s = N_("label36");
-gchar *s = N_("_search");
-gchar *s = N_("in namespace");
-gchar *s = N_("global (everywhere)");
-gchar *s = N_("_Download");
-gchar *s = N_("index");
-gchar *s = N_("insert");
-gchar *s = N_("file only");
-gchar *s = N_("recursive (for entire directories)");
-gchar *s = N_("_Filename");
-gchar *s = N_("Browse");
-gchar *s = N_("_Insert");
-gchar *s = N_("_create");
-gchar *s = N_("_Namespace");
-gchar *s = N_("_Directory");
-gchar *s = N_("_Collection");
-gchar *s = N_("_Advertisement");
-gchar *s = N_("_delete");
-gchar *s = N_("Will prevent future insertions into the namespace (will not 
delete content in the namespace)");
-gchar *s = N_("_Namespace");
-gchar *s = N_("end collection (will not delete content already in the 
collection)");
-gchar *s = N_("_Collection");
-gchar *s = N_("label62");
-gchar *s = N_("label39");
-gchar *s = N_("Content");
-gchar *s = N_("_Advanced");
-gchar *s = N_("_File sharing");
-gchar *s = N_("label68");
-gchar *s = N_("_Statistics");
-gchar *s = N_("label59");
-gchar *s = N_("label38");
-gchar *s = N_("/join #gnunet");
-gchar *s = N_("_Chat");
-gchar *s = N_("File Information");
-gchar *s = N_("_Done");
-gchar *s = N_("Please provide meta-data and keywords for the content.");
-gchar *s = N_("_Type");
-gchar *s = N_("unknown");
-gchar *s = N_("filename");
-gchar *s = N_("meta-data");
-gchar *s = N_("_Value");
-gchar *s = N_("Meta-data");
-gchar *s = N_("_Keyword");
-gchar *s = N_("Keywords");
-gchar *s = N_("File Information");
-gchar *s = N_("Done");
-gchar *s = N_("Meta-data");
-gchar *s = N_("Search Results");
-gchar *s = N_("_Download");
-gchar *s = N_("Namespace Contents");
-gchar *s = N_("_Insert");
-gchar *s = N_("_Update");
-gchar *s = N_("Chat");
-gchar *s = N_("Senden");

Added: gnunet-gtk/todo
===================================================================
--- gnunet-gtk/todo     2005-05-24 11:18:12 UTC (rev 806)
+++ gnunet-gtk/todo     2005-05-24 11:20:25 UTC (rev 807)
@@ -0,0 +1,46 @@
+High priority:
+* figure out how list views work
+* decide between C and C++ 
+  (figure out how to inspect internals of
+   object tree in C / C++)
+* basic FS integration (insert, search, download)
+* better widget naming -- conventions?
+
+Important:
+* look at pango for welcome/splash screen
+* advanced FS operations (namespace, collection)
+* stats integration
+* available apps
+* about dialog
+
+Later:
+* more help-texts
+* pop-up dialogs
+* chat
+
+
+
+gnunet-gtk wishlist (from pre-0.7.0 days):
+
+- while (!) downloading directory, display already received results
+  for download (now supported by libecrs!)
+- add option to list all indexed files and perhaps delete from them
+  (ECRS now supports listing of indexed files!)
+- for potentially long clists, add option to specify a string
+  pattern that must be matched for the lines to be displayed
+  (to further prune search results, for example)
+- implement search bookmarking (e.g. user could add/edit/delete
+  favourite namespace/key etc combinations)
+- in Assemble Directory's Files Available/Selected
+    Add sortability
+    Add multiselection
+    Print filenames as well
+- add right button popup menu operations for
+    Select by pattern
+  in the search result list.
+- a completely new interactive namespace/directory building
+  module that would allow importing files/directories from
+  disk and edit various parameters, file descriptions and
+  the dir tree structure before the insertion.
+- give user opportunity to change namespace rating after
+  namespace download succeeded





reply via email to

[Prev in Thread] Current Thread [Next in Thread]