gnunet-svn
[Top][All Lists]
Advanced

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

[GNUnet-SVN] r16549 - in gnunet-gtk: . contrib


From: gnunet
Subject: [GNUnet-SVN] r16549 - in gnunet-gtk: . contrib
Date: Mon, 15 Aug 2011 16:20:33 +0200

Author: grothoff
Date: 2011-08-15 16:20:33 +0200 (Mon, 15 Aug 2011)
New Revision: 16549

Added:
   gnunet-gtk/contrib/gnunet_fs_gtk_about_dialog.glade
   gnunet-gtk/contrib/gnunet_fs_gtk_advertise_pseudonym_dialog.glade
   gnunet-gtk/contrib/gnunet_fs_gtk_create_namespace_dialog.glade
   gnunet-gtk/contrib/gnunet_fs_gtk_download_as_dialog.glade
   gnunet-gtk/contrib/gnunet_fs_gtk_main_tab_new_frame.glade
   gnunet-gtk/contrib/gnunet_fs_gtk_main_window.glade
   gnunet-gtk/contrib/gnunet_fs_gtk_open_directory_dialog.glade
   gnunet-gtk/contrib/gnunet_fs_gtk_open_url_dialog.glade
   gnunet-gtk/contrib/gnunet_fs_gtk_publish_dialog.glade
   gnunet-gtk/contrib/gnunet_fs_gtk_publish_directory_dialog.glade
   gnunet-gtk/contrib/gnunet_fs_gtk_publish_edit_dialog.glade
   gnunet-gtk/contrib/gnunet_fs_gtk_publish_file_dialog.glade
   gnunet-gtk/contrib/gnunet_fs_gtk_publish_tab.glade
   gnunet-gtk/contrib/gnunet_fs_gtk_search_dialog.glade
   gnunet-gtk/contrib/gnunet_fs_gtk_search_tab.glade
   gnunet-gtk/contrib/gnunet_fs_gtk_select_pseudonym_dialog.glade
   gnunet-gtk/contrib/gnunet_gtk_status_bar_menu.glade
   gnunet-gtk/contrib/gnunet_setup_gtk_main_window.glade
   gnunet-gtk/gnunet-fs-gtk.desktop.in
   gnunet-gtk/gnunet-setup-oxygen-cancel.png
   gnunet-gtk/gnunet-setup-oxygen-ok.png
   gnunet-gtk/gnunet-setup.desktop.in
Removed:
   gnunet-gtk/contrib/about.glade
   gnunet-gtk/contrib/advertise_pseudonym_dialog.glade
   gnunet-gtk/contrib/create_namespace_dialog.glade
   gnunet-gtk/contrib/download_as.glade
   gnunet-gtk/contrib/main-window.glade
   gnunet-gtk/contrib/main_tab_new_frame.glade
   gnunet-gtk/contrib/open_directory_dialog.glade
   gnunet-gtk/contrib/open_url_dialog.glade
   gnunet-gtk/contrib/publish-directory-dialog.glade
   gnunet-gtk/contrib/publish-file-dialog.glade
   gnunet-gtk/contrib/publish_dialog.glade
   gnunet-gtk/contrib/publish_edit_dialog.glade
   gnunet-gtk/contrib/publish_tab.glade
   gnunet-gtk/contrib/search_dialog.glade
   gnunet-gtk/contrib/search_tab.glade
   gnunet-gtk/contrib/select_pseudonym_dialog.glade
   gnunet-gtk/contrib/status_bar_menu.glade
   gnunet-gtk/gnunet-gtk.desktop.in
Modified:
   gnunet-gtk/ChangeLog
   gnunet-gtk/Makefile.am
   gnunet-gtk/contrib/Makefile.am
Log:
integrating gnunet-setup build

Modified: gnunet-gtk/ChangeLog
===================================================================
--- gnunet-gtk/ChangeLog        2011-08-15 14:17:12 UTC (rev 16548)
+++ gnunet-gtk/ChangeLog        2011-08-15 14:20:33 UTC (rev 16549)
@@ -1,3 +1,15 @@
+Mon Aug 15 16:18:22 CEST 2011
+       Merging gnunet-setup and gnunet-gtk projects.
+
+Mon Jul 11 17:21:05 CEST 2011
+       Releasing gnunet-setup 0.9.0pre3.
+
+       With this release we will finally start with
+       a detailed accounting of changes in the ChangeLog.
+
+Mon Nov  1 13:03:59 CET 2010
+       gnunet-setup started.
+
 Fri Jun 10 11:07:58 CEST 2011
        Releasing gnunet-gtk 0.9.0pre3.  Instead of listing all that has
        changed, here is the short list of what is known NOT to work:

Modified: gnunet-gtk/Makefile.am
===================================================================
--- gnunet-gtk/Makefile.am      2011-08-15 14:17:12 UTC (rev 16548)
+++ gnunet-gtk/Makefile.am      2011-08-15 14:20:33 UTC (rev 16549)
@@ -3,12 +3,31 @@
 SUBDIRS = contrib doc po src pixmaps
 
 desktopdir = $(datadir)/applications
-desktop_in_files = gnunet-gtk.desktop.in
+desktop_in_files = \
+  gnunet-fs-gtk.desktop.in \
+  gnunet-setup.desktop.in
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 
 pkgpixdir= $(pkgdatadir)
 
-EXTRA_DIST = config.rpath  \
-  install-sh mkinstalldirs
+ACLOCAL_AMFLAGS = -I m4
 
-ACLOCAL_AMFLAGS = -I m4
+IMAGES = \
+ gnunet-setup-oxygen-cancel.png \
+ gnunet-setup-oxygen-ok.png 
+
+pkgpixdir= $(pkgdatadir)
+
+install-data-local:
+       @$(NORMAL_INSTALL)
+       $(mkinstalldirs) $(DESTDIR)$(pkgpixdir)
+       for pixmap in $(IMAGES); do \
+         if test -f $$pixmap; then \
+           $(INSTALL_DATA) $$pixmap $(DESTDIR)$(pkgpixdir); \
+         fi \
+       done
+
+EXTRA_DIST = \
+  config.rpath  \
+  install-sh mkinstalldirs \
+  $(IMAGES) 

Modified: gnunet-gtk/contrib/Makefile.am
===================================================================
--- gnunet-gtk/contrib/Makefile.am      2011-08-15 14:17:12 UTC (rev 16548)
+++ gnunet-gtk/contrib/Makefile.am      2011-08-15 14:20:33 UTC (rev 16549)
@@ -1,4 +1,4 @@
-## Process this file with automake to produce Makefile.in
+# Process this file with automake to produce Makefile.in
 
 SUBDIRS = .
 
@@ -8,23 +8,24 @@
   $(pkgdata_DATA) 
 
 pkgdata_DATA = \
-  about.glade \
-  advertise_pseudonym_dialog.glade \
-  create_namespace_dialog.glade \
-  download_as.glade \
-  main_tab_new_frame.glade \
-  main-window.glade \
-  open_directory_dialog.glade \
-  open_url_dialog.glade \
-  publish_dialog.glade \
-  publish-directory-dialog.glade \
-  publish_edit_dialog.glade \
-  publish-file-dialog.glade \
-  publish_tab.glade \
-  search_dialog.glade \
-  search_tab.glade \
-  select_pseudonym_dialog.glade \
-  status_bar_menu.glade 
+  gnunet_fs_gtk_about_dialog.glade \
+  gnunet_fs_gtk_advertise_pseudonym_dialog.glade \
+  gnunet_fs_gtk_create_namespace_dialog.glade \
+  gnunet_fs_gtk_download_as_dialog.glade \
+  gnunet_fs_gtk_main_tab_new_frame.glade \
+  gnunet_fs_gtk_main_window.glade \
+  gnunet_fs_gtk_open_directory_dialog.glade \
+  gnunet_fs_gtk_open_url_dialog.glade \
+  gnunet_fs_gtk_publish_dialog.glade \
+  gnunet_fs_gtk_publish_directory_dialog.glade \
+  gnunet_fs_gtk_publish_edit_dialog.glade \
+  gnunet_fs_gtk_publish_file_dialog.glade \
+  gnunet_fs_gtk_publish_tab.glade \
+  gnunet_fs_gtk_search_dialog.glade \
+  gnunet_fs_gtk_search_tab.glade \
+  gnunet_fs_gtk_select_pseudonym_dialog.glade \
+  gnunet_gtk_status_bar_menu.glade \
+  gnunet_setup_gtk_main_window.glade
 
 install-data-local:
        $(mkinstalldirs) $(DESTDIR)$(pkgpixdir)

Deleted: gnunet-gtk/contrib/about.glade
===================================================================
--- gnunet-gtk/contrib/about.glade      2011-08-15 14:17:12 UTC (rev 16548)
+++ gnunet-gtk/contrib/about.glade      2011-08-15 14:20:33 UTC (rev 16549)
@@ -1,370 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <requires lib="gtk+" version="2.20"/>
-  <!-- interface-naming-policy project-wide -->
-  <object class="GtkAboutDialog" id="GNUNET_GTK_about_dialog">
-    <property name="border_width">5</property>
-    <property name="title" translatable="yes">About gnunet-gtk</property>
-    <property name="modal">True</property>
-    <property name="window_position">center</property>
-    <property name="type_hint">normal</property>
-    <property name="skip_taskbar_hint">True</property>
-    <property name="skip_pager_hint">True</property>
-    <property name="urgency_hint">True</property>
-    <property name="has_separator">False</property>
-    <property name="program_name">gnunet-gtk</property>
-    <property name="version">0.9.0</property>
-    <property name="copyright" translatable="yes">(C) 2010 The GNUnet 
Project</property>
-    <property name="website">https://gnunet.org/</property>
-    <property name="license" translatable="yes">                    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
-</property>
-    <property name="authors">Juergen Appel &lt;address@hidden&gt;
-Krista Grothoff &lt;address@hidden&gt;
-James Blackwell &lt;address@hidden&gt;
-Ludovic Courtes &lt;address@hidden&gt;
-Nils Durner &lt;address@hidden&gt;
-Renaldo Ferreira &lt;address@hidden&gt;
-Christian Grothoff &lt;address@hidden&gt;
-Eric Haumant
-Tzvetan Horozov &lt;address@hidden&gt;
-Gerd Knorr &lt;address@hidden&gt;
-Werner Koch &lt;address@hidden&gt;
-Uli Luckas &lt;address@hidden&gt;
-Blake Matheny
-Glenn McGrath
-Hendrik Pagenhardt &lt;address@hidden&gt;
-Ioana Patrascu &lt;address@hidden&gt;
-Marko Raeihae
-Paul Ruth &lt;address@hidden&gt;
-Risto Saarelma
-Antti Salonen
-Tiberius Stef &lt;address@hidden&gt;
-Tuomas Toivonen
-Tomi Tukiainen
-Kevin Vandersloot &lt;address@hidden&gt;
-Simo Viitanen
-Larry Waldo
-Igor Wronsky &lt;address@hidden&gt;
-&lt;address@hidden&gt;
-</property>
-    <property name="documenters">Christian Grothoff &lt;address@hidden&gt;
-Nils Durner &lt;address@hidden&gt;</property>
-    <property name="translator_credits" translatable="yes" 
comments="TRANSLATORS: Replace this string with your names, one name per 
line.">Di Ma
-Jens Palsberg &lt;address@hidden&gt;
-Christian Grothoff &lt;address@hidden&gt;
-Nils Durner &lt;address@hidden&gt;
-Mathieu &lt;address@hidden&gt;
-Eric Haumant
address@hidden
-Hiroshi Yamauchi &lt;address@hidden&gt;
-Adam Welc &lt;address@hidden&gt;
-Bogdan Carbunar &lt;address@hidden&gt;
-Steven Michael Murphy &lt;address@hidden&gt;
-Phan Vinh Thinh &lt;address@hidden&gt;
-Daniel Nylander &lt;address@hidden&gt;
-</property>
-    <property name="artists">Christian Muellner &lt;address@hidden&gt;
-Alex Jones &lt;address@hidden&gt;</property>
-    <property name="logo">gnunet_logo.png</property>
-    <child internal-child="vbox">
-      <object class="GtkVBox" id="vbox">
-        <property name="visible">True</property>
-        <property name="spacing">2</property>
-        <child>
-          <placeholder/>
-        </child>
-        <child internal-child="action_area">
-          <object class="GtkHButtonBox" id="dialog-action_area1">
-            <property name="visible">True</property>
-            <property name="layout_style">end</property>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="pack_type">end</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-  </object>
-</interface>

Deleted: gnunet-gtk/contrib/advertise_pseudonym_dialog.glade
===================================================================
--- gnunet-gtk/contrib/advertise_pseudonym_dialog.glade 2011-08-15 14:17:12 UTC 
(rev 16548)
+++ gnunet-gtk/contrib/advertise_pseudonym_dialog.glade 2011-08-15 14:20:33 UTC 
(rev 16549)
@@ -1,722 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <requires lib="gtk+" version="2.20"/>
-  <!-- interface-naming-policy project-wide -->
-  <object class="GtkAdjustment" id="expiration_year_adjustment">
-    <property name="upper">9999</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">5</property>
-  </object>
-  <object class="GtkAdjustment" id="priority_adjustment">
-    <property name="upper">10000000</property>
-    <property name="value">1000</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
-  </object>
-  <object class="GtkAdjustment" id="GNUNET_GTK_anonymity_adjustment">
-    <property name="upper">100000</property>
-    <property name="value">1</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
-  </object>
-  <object class="GtkListStore" id="GNUNET_GTK_keyword_list_store">
-    <columns>
-      <!-- column-name keyword -->
-      <column type="gchararray"/>
-    </columns>
-  </object>
-  <object class="GtkDialog" id="GNUNET_GTK_advertise_pseudonym_dialog">
-    <property name="border_width">5</property>
-    <property name="title" translatable="yes">Advertise namespace</property>
-    <property name="destroy_with_parent">True</property>
-    <property name="type_hint">dialog</property>
-    <property name="skip_taskbar_hint">True</property>
-    <property name="has_separator">False</property>
-    <child internal-child="vbox">
-      <object class="GtkVBox" id="GNUNET_GTK_advertise_pseudonym_master_vbox">
-        <property name="visible">True</property>
-        <property name="spacing">2</property>
-        <child>
-          <object class="GtkHBox" 
id="GNUNET_GTK_advertise_pseudonym_metadata_hbox">
-            <property name="visible">True</property>
-            <child>
-              <object class="GtkVBox" 
id="GNUNET_GTK_advertise_pseudonym_metadata_vbox">
-                <property name="visible">True</property>
-                <property name="spacing">5</property>
-                <child>
-                  <object class="GtkHBox" 
id="GNUNET_GTK_advertise_pseudonym_metadata_edit_hbox">
-                    <property name="visible">True</property>
-                    <child>
-                      <object class="GtkLabel" 
id="GNUNET_GTK_advertise_pseudonym_metadata_type_label">
-                        <property name="visible">True</property>
-                        <property name="label" 
translatable="yes">Type:</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkScrolledWindow" 
id="GNUNET_GTK_advertise_pseudonym_metadata_type_scrolled_window">
-                        <property name="height_request">100</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="hscrollbar_policy">never</property>
-                        <property name="vscrollbar_policy">automatic</property>
-                        <child>
-                          <object class="GtkTreeView" 
id="GNUNET_GTK_advertise_pseudonym_metadata_type_tree_view">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property 
name="model">GNUNET_GTK_metatype_list_store</property>
-                            <property name="headers_visible">False</property>
-                            <property name="headers_clickable">False</property>
-                            <property name="reorderable">True</property>
-                            <property name="enable_search">False</property>
-                            <property name="tooltip_column">2</property>
-                            <child>
-                              <object class="GtkTreeViewColumn" 
id="GNUNET_GTK_advertise_pseudonym_metadata_type_tree_view_column">
-                                <property name="title" 
translatable="yes">Value</property>
-                                <property name="sort_column_id">0</property>
-                                <child>
-                                  <object class="GtkCellRendererText" 
id="GNUNET_GTK_advertise_pseudonym_metadata_type_tree_view_renderer"/>
-                                  <attributes>
-                                    <attribute name="text">0</attribute>
-                                  </attributes>
-                                </child>
-                              </object>
-                            </child>
-                          </object>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkLabel" 
id="GNUNET_GTK_advertise_pseudonym_metadata_value_label">
-                        <property name="visible">True</property>
-                        <property name="label" 
translatable="yes">Value:</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
-                        <property name="padding">5</property>
-                        <property name="position">2</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkEntry" 
id="GNUNET_GTK_advertise_pseudonym_metadata_value_entry">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="invisible_char">●</property>
-                        <signal name="changed" 
handler="GNUNET_GTK_advertise_pseudonym_metadata_value_entry_changed_cb" 
swapped="no"/>
-                      </object>
-                      <packing>
-                        <property name="position">3</property>
-                      </packing>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkScrolledWindow" 
id="GNUNET_GTK_advertise_pseudonym_metadata_scrolled_window">
-                    <property name="width_request">400</property>
-                    <property name="height_request">120</property>
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="hadjustment">adjustment1</property>
-                    <property name="vadjustment">adjustment2</property>
-                    <property name="hscrollbar_policy">automatic</property>
-                    <property name="vscrollbar_policy">automatic</property>
-                    <child>
-                      <object class="GtkTreeView" 
id="GNUNET_GTK_advertise_pseudonym_metadata_tree_view">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property 
name="model">GNUNET_GTK_meta_data_list_store</property>
-                        <property name="hadjustment">adjustment1</property>
-                        <property name="vadjustment">adjustment2</property>
-                        <property name="enable_search">False</property>
-                        <child>
-                          <object class="GtkTreeViewColumn" 
id="GNUNET_GTK_advertise_pseudonym_metadata_tree_view_type_column">
-                            <property name="sizing">fixed</property>
-                            <property name="fixed_width">120</property>
-                            <property name="title" 
translatable="yes">Type</property>
-                            <property name="reorderable">True</property>
-                            <property name="sort_column_id">2</property>
-                            <child>
-                              <object class="GtkCellRendererText" 
id="GNUNET_GTK_advertise_pseudonym_metadata_tree_view_type_renderer"/>
-                              <attributes>
-                                <attribute name="text">2</attribute>
-                              </attributes>
-                            </child>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkTreeViewColumn" 
id="GNUNET_GTK_advertise_pseudonym_metadata_tree_view_description_column">
-                            <property name="title" 
translatable="yes">Value</property>
-                            <property name="expand">True</property>
-                            <property name="reorderable">True</property>
-                            <property name="sort_column_id">3</property>
-                            <child>
-                              <object class="GtkCellRendererText" 
id="GNUNET_GTK_advertise_pseudonym_metadata_tree_view_value_renderer"/>
-                              <attributes>
-                                <attribute name="text">3</attribute>
-                              </attributes>
-                            </child>
-                          </object>
-                        </child>
-                      </object>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkVBox" 
id="GNUNET_GTK_advertise_pseudonym_metadata_button_vbox">
-                <property name="visible">True</property>
-                <child>
-                  <object class="GtkButton" 
id="GNUNET_GTK_advertise_pseudonym_metadata_add_button">
-                    <property name="label">gtk-add</property>
-                    <property name="visible">True</property>
-                    <property name="sensitive">False</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">True</property>
-                    <property name="use_action_appearance">False</property>
-                    <property name="use_stock">True</property>
-                    <signal name="clicked" 
handler="GNUNET_GTK_advertise_pseudonym_metadata_add_button_clicked_cb" 
swapped="no"/>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkButton" 
id="GNUNET_GTK_advertise_pseudonym_metadata_delete_button">
-                    <property name="label">gtk-delete</property>
-                    <property name="visible">True</property>
-                    <property name="sensitive">False</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">True</property>
-                    <property name="use_action_appearance">False</property>
-                    <property name="use_stock">True</property>
-                    <signal name="clicked" 
handler="GNUNET_GTK_advertise_pseudonym_metadata_delete_button_clicked_cb" 
swapped="no"/>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="padding">5</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" 
id="GNUNET_GTK_advertise_pseudonym_metadata_preview_label">
-                    <property name="visible">True</property>
-                    <property name="label" 
translatable="yes">Preview:</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="padding">10</property>
-                    <property name="position">2</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkImage" 
id="GNUNET_GTK_advertise_pseudonym_metadata_preview_image">
-                    <property name="sensitive">False</property>
-                    <property name="stock">gtk-missing-image</property>
-                  </object>
-                  <packing>
-                    <property name="position">3</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkFileChooserButton" 
id="GNUNET_GTK_advertise_pseudonym_metadata_preview_file_chooser_button">
-                    <property name="create_folders">False</property>
-                    <property name="title" translatable="yes">Select 
file</property>
-                    <signal name="file-set" 
handler="GNUNET_GTK_advertise_pseudonym_metadata_preview_file_chooser_button_file_set_cb"
 swapped="no"/>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="position">4</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="padding">5</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="position">1</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkHBox" 
id="GNUNET_GTK_advertise_pseudonym_secondary_hbox">
-            <property name="visible">True</property>
-            <child>
-              <object class="GtkVBox" 
id="GNUNET_GTK_advertise_pseudonym_keyword_entry_vbox">
-                <property name="visible">True</property>
-                <child>
-                  <object class="GtkHBox" 
id="GNUNET_GTK_advertise_pseudonym_keyword_hbox">
-                    <property name="visible">True</property>
-                    <child>
-                      <object class="GtkLabel" 
id="GNUNET_GTK_advertise_pseudonym_keyword_label">
-                        <property name="visible">True</property>
-                        <property name="label" 
translatable="yes">_Keyword:</property>
-                        <property name="use_underline">True</property>
-                        <property 
name="mnemonic_widget">GNUNET_GTK_advertise_pseudonym_keyword_entry</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkEntry" 
id="GNUNET_GTK_advertise_pseudonym_keyword_entry">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="invisible_char">●</property>
-                        <property name="caps_lock_warning">False</property>
-                        <signal name="changed" 
handler="GNUNET_GTK_advertise_pseudonym_keyword_entry_changed_cb" swapped="no"/>
-                        <signal name="activate" 
handler="GNUNET_GTK_advertise_pseudonym_keyword_entry_activate_cb" 
swapped="no"/>
-                      </object>
-                      <packing>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="padding">5</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkHBox" 
id="GNUNET_GTK_advertise_pseudonym_keyword_list_hbox">
-                    <property name="visible">True</property>
-                    <child>
-                      <object class="GtkScrolledWindow" 
id="GNUNET_GTK_advertise_pseudonym_keyword_scrolled_window">
-                        <property name="width_request">400</property>
-                        <property name="height_request">120</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="hadjustment">adjustment3</property>
-                        <property name="vadjustment">adjustment4</property>
-                        <property name="hscrollbar_policy">never</property>
-                        <property name="vscrollbar_policy">automatic</property>
-                        <child>
-                          <object class="GtkTreeView" 
id="GNUNET_GTK_advertise_pseudonym_keyword_list_tree_view">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property 
name="model">GNUNET_GTK_keyword_list_store</property>
-                            <property name="hadjustment">adjustment3</property>
-                            <property name="vadjustment">adjustment4</property>
-                            <property name="search_column">0</property>
-                            <child>
-                              <object class="GtkTreeViewColumn" 
id="GNUNET_GTK_advertise_pseudonym_keyword_list_tree_view_column">
-                                <property name="title" 
translatable="yes">Keywords</property>
-                                <property name="reorderable">True</property>
-                                <property name="sort_column_id">0</property>
-                                <child>
-                                  <object class="GtkCellRendererText" 
id="GNUNET_GTK_advertise_pseudonym_keyword_list_tree_view_renderer"/>
-                                  <attributes>
-                                    <attribute name="text">0</attribute>
-                                  </attributes>
-                                </child>
-                              </object>
-                            </child>
-                          </object>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkVBox" 
id="GNUNET_GTK_advertise_pseudonym_keyword_list_button_vbox">
-                        <property name="visible">True</property>
-                        <child>
-                          <object class="GtkButton" 
id="GNUNET_GTK_advertise_pseudonym_keyword_list_add_button">
-                            <property name="label">gtk-add</property>
-                            <property name="visible">True</property>
-                            <property name="sensitive">False</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">True</property>
-                            <property 
name="use_action_appearance">False</property>
-                            <property name="use_stock">True</property>
-                            <signal name="clicked" 
handler="GNUNET_GTK_advertise_pseudonym_keyword_list_add_button_clicked_cb" 
swapped="no"/>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkButton" 
id="GNUNET_GTK_advertise_pseudonym_keyword_list_del_button">
-                            <property name="label">gtk-delete</property>
-                            <property name="visible">True</property>
-                            <property name="sensitive">False</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">True</property>
-                            <property 
name="use_action_appearance">False</property>
-                            <property name="use_stock">True</property>
-                            <signal name="clicked" 
handler="GNUNET_GTK_advertise_pseudonym_keyword_list_del_button_clicked_cb" 
swapped="no"/>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                            <property name="padding">5</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkButton" 
id="GNUNET_GTK_advertise_pseudonym_keyword_list_normalize_button">
-                            <property name="label" 
translatable="yes">_Normalize</property>
-                            <property name="sensitive">False</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">True</property>
-                            <property 
name="use_action_appearance">False</property>
-                            <property name="use_underline">True</property>
-                            <signal name="clicked" 
handler="GNUNET_GTK_advertise_pseudonym_keyword_list_normalize_button_clicked_cb"
 swapped="no"/>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                            <property name="position">2</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
-                        <property name="padding">5</property>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="padding">5</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkVBox" 
id="GNUNET_GTK_advertise_pseudonym_misc_vbox">
-                <property name="visible">True</property>
-                <child>
-                  <object class="GtkLabel" 
id="GNUNET_GTK_advertise_pseudonym_options_label">
-                    <property name="visible">True</property>
-                    <property name="label" 
translatable="yes">Options</property>
-                    <property name="justify">center</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="padding">5</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkHSeparator" id="hseparator3">
-                    <property name="visible">True</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="padding">5</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkHBox" 
id="GNUNET_GTK_advertise_pseudonym_anonymity_hbox">
-                    <property name="visible">True</property>
-                    <child>
-                      <object class="GtkLabel" 
id="GNUNET_GTK_advertise_pseudonym_anonymity_label">
-                        <property name="visible">True</property>
-                        <property name="label" 
translatable="yes">_Anonymity:</property>
-                        <property name="use_underline">True</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
-                        <property name="padding">5</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkSpinButton" 
id="GNUNET_GTK_advertise_pseudonym_anonymity_spin_button">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="tooltip_markup">Anonymity of zero 
means no anonymity.  Values larger than one require GNUnet to have cover 
traffic (with larger values implying more cover traffic).</property>
-                        <property name="invisible_char">●</property>
-                        <property 
name="adjustment">GNUNET_GTK_anonymity_adjustment</property>
-                        <signal name="value-changed" 
handler="GNUNET_GTK_anonymity_spin_button_value_changed_cb" after="yes" 
swapped="no"/>
-                      </object>
-                      <packing>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="position">2</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkHSeparator" id="hseparator1">
-                    <property name="visible">True</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="position">3</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkHBox" 
id="GNUNET_GTK_advertise_pseudonym_priority_hbox">
-                    <property name="visible">True</property>
-                    <child>
-                      <object class="GtkLabel" 
id="GNUNET_GTK_advertise_pseudonym_priority_label">
-                        <property name="visible">True</property>
-                        <property name="label" 
translatable="yes">_Priority:</property>
-                        <property name="use_underline">True</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="padding">5</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkSpinButton" 
id="GNUNET_GTK_advertise_pseudonym_priority_spin_button">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="tooltip_markup">The content priority 
determines when content is discarded in favour of other, more popular content.  
</property>
-                        <property name="invisible_char">●</property>
-                        <property 
name="adjustment">priority_adjustment</property>
-                        <property name="numeric">True</property>
-                      </object>
-                      <packing>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="position">4</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkHSeparator" id="hseparator2">
-                    <property name="visible">True</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="position">5</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkHBox" id="hbox1">
-                    <property name="visible">True</property>
-                    <child>
-                      <object class="GtkLabel" 
id="GNUNET_GTK_advertise_pseudonym_root_label">
-                        <property name="visible">True</property>
-                        <property name="label" 
translatable="yes">_Root:</property>
-                        <property name="use_underline">True</property>
-                        <property name="selectable">True</property>
-                      </object>
-                      <packing>
-                        <property name="padding">5</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkEntry" 
id="GNUNET_GTK_advertise_pseudonym_root_entry">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="invisible_char">•</property>
-                        <property name="text" 
translatable="yes">root</property>
-                      </object>
-                      <packing>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="position">6</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkHSeparator" id="hseparator4">
-                    <property name="visible">True</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="position">7</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkHBox" id="hbox2">
-                    <property name="visible">True</property>
-                    <child>
-                      <object class="GtkLabel" 
id="GNUNET_GTK_advertise_pseudonym_expiration_label">
-                        <property name="visible">True</property>
-                        <property name="label" translatable="yes">_Expriation 
year:</property>
-                        <property name="use_underline">True</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="padding">5</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkSpinButton" 
id="GNUNET_GTK_advertise_pseudonym_expiration_year_spin_button">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="max_length">4</property>
-                        <property name="invisible_char">•</property>
-                        <property 
name="adjustment">expiration_year_adjustment</property>
-                        <property name="climb_rate">1</property>
-                        <property name="numeric">True</property>
-                      </object>
-                      <packing>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="position">8</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="padding">11</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="padding">5</property>
-            <property name="position">2</property>
-          </packing>
-        </child>
-        <child internal-child="action_area">
-          <object class="GtkHButtonBox" id="dialog-action_area13">
-            <property name="visible">True</property>
-            <property name="layout_style">end</property>
-            <child>
-              <object class="GtkButton" 
id="GNUNET_GTK_advertise_pseudonym_cancel_button">
-                <property name="label">gtk-cancel</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
-                <property name="use_stock">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkButton" 
id="GNUNET_GTK_advertise_pseudonym_confirm_button">
-                <property name="label">gtk-ok</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
-                <property name="use_stock">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="pack_type">end</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-    <action-widgets>
-      <action-widget 
response="-6">GNUNET_GTK_advertise_pseudonym_cancel_button</action-widget>
-      <action-widget 
response="-5">GNUNET_GTK_advertise_pseudonym_confirm_button</action-widget>
-    </action-widgets>
-  </object>
-  <object class="GtkListStore" id="GNUNET_GTK_meta_data_list_store">
-    <columns>
-      <!-- column-name extractor_meta_type -->
-      <column type="guint"/>
-      <!-- column-name extractor_meta_format -->
-      <column type="guint"/>
-      <!-- column-name extractor_meta_type_string -->
-      <column type="gchararray"/>
-      <!-- column-name extracotr_meta_value -->
-      <column type="gchararray"/>
-    </columns>
-  </object>
-  <object class="GtkListStore" id="GNUNET_GTK_metatype_list_store">
-    <columns>
-      <!-- column-name description -->
-      <column type="gchararray"/>
-      <!-- column-name guint1 -->
-      <column type="guint"/>
-      <!-- column-name helptext -->
-      <column type="gchararray"/>
-    </columns>
-  </object>
-  <object class="GtkAdjustment" id="adjustment1">
-    <property name="upper">100</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
-    <property name="page_size">10</property>
-  </object>
-  <object class="GtkAdjustment" id="adjustment2">
-    <property name="upper">100</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
-    <property name="page_size">10</property>
-  </object>
-  <object class="GtkAdjustment" id="adjustment3">
-    <property name="upper">100</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
-    <property name="page_size">10</property>
-  </object>
-  <object class="GtkAdjustment" id="adjustment4">
-    <property name="upper">100</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
-    <property name="page_size">10</property>
-  </object>
-</interface>

Deleted: gnunet-gtk/contrib/create_namespace_dialog.glade
===================================================================
--- gnunet-gtk/contrib/create_namespace_dialog.glade    2011-08-15 14:17:12 UTC 
(rev 16548)
+++ gnunet-gtk/contrib/create_namespace_dialog.glade    2011-08-15 14:20:33 UTC 
(rev 16549)
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <requires lib="gtk+" version="2.20"/>
-  <!-- interface-naming-policy project-wide -->
-  <object class="GtkDialog" id="GNUNET_GTK_create_namespace_dialog">
-    <property name="visible">True</property>
-    <property name="can_default">True</property>
-    <property name="border_width">5</property>
-    <property name="title" translatable="yes">Create namespace</property>
-    <property name="resizable">False</property>
-    <property name="modal">True</property>
-    <property name="window_position">center</property>
-    <property name="icon_name">folder-new</property>
-    <property name="type_hint">dialog</property>
-    <property name="skip_taskbar_hint">True</property>
-    <property name="has_separator">False</property>
-    <child internal-child="vbox">
-      <object class="GtkVBox" id="GNUNET_GTK_create_namespace_vbox">
-        <property name="visible">True</property>
-        <property name="spacing">2</property>
-        <child>
-          <object class="GtkHBox" id="GNUNET_GTK_create_namespace_value_hbox">
-            <property name="visible">True</property>
-            <child>
-              <object class="GtkLabel" 
id="GNUNET_GTK_create_namespace_name_label">
-                <property name="visible">True</property>
-                <property name="label" translatable="yes">_Name:</property>
-                <property name="use_underline">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="padding">4</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkEntry" 
id="GNUNET_GTK_create_namespace_name_entry">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="invisible_char">●</property>
-                <property name="activates_default">True</property>
-              </object>
-              <packing>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">False</property>
-            <property name="padding">5</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child internal-child="action_area">
-          <object class="GtkHButtonBox" 
id="GNUNET_GTK_create_namespace_dialog-action_area">
-            <property name="visible">True</property>
-            <property name="layout_style">end</property>
-            <child>
-              <object class="GtkButton" 
id="GNUNET_GTK_create_namespace_cancel_button">
-                <property name="label">gtk-cancel</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
-                <property name="use_stock">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkButton" 
id="GNUNET_GTK_create_namespace_ok_button">
-                <property name="label">gtk-ok</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="can_default">True</property>
-                <property name="has_default">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
-                <property name="use_stock">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-    <action-widgets>
-      <action-widget 
response="-6">GNUNET_GTK_create_namespace_cancel_button</action-widget>
-      <action-widget 
response="-5">GNUNET_GTK_create_namespace_ok_button</action-widget>
-    </action-widgets>
-  </object>
-</interface>

Deleted: gnunet-gtk/contrib/download_as.glade
===================================================================
--- gnunet-gtk/contrib/download_as.glade        2011-08-15 14:17:12 UTC (rev 
16548)
+++ gnunet-gtk/contrib/download_as.glade        2011-08-15 14:20:33 UTC (rev 
16549)
@@ -1,134 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <requires lib="gtk+" version="2.20"/>
-  <!-- interface-naming-policy project-wide -->
-  <object class="GtkAdjustment" id="GNUNET_GTK_anonymity_adjustment">
-    <property name="upper">100000</property>
-    <property name="value">1</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
-  </object>
-  <object class="GtkFileChooserDialog" id="GNUNET_GTK_save_as_dialog">
-    <property name="can_default">True</property>
-    <property name="has_default">True</property>
-    <property name="border_width">5</property>
-    <property name="title" translatable="yes">Save file as...</property>
-    <property name="window_position">center-on-parent</property>
-    <property name="destroy_with_parent">True</property>
-    <property name="icon_name">document-save-as</property>
-    <property name="type_hint">dialog</property>
-    <property name="has_separator">False</property>
-    <property name="use_preview_label">False</property>
-    <property name="action">save</property>
-    <property name="preview_widget_active">False</property>
-    <child internal-child="vbox">
-      <object class="GtkVBox" id="dialog-vbox4">
-        <property name="visible">True</property>
-        <property name="spacing">2</property>
-        <child>
-          <object class="GtkHBox" id="hbox2">
-            <property name="visible">True</property>
-            <child>
-              <object class="GtkLabel" 
id="GNUNET_GTK_save_as_dialog_anonymity_label">
-                <property name="visible">True</property>
-                <property name="label" 
translatable="yes">_Anonymity:</property>
-                <property name="use_underline">True</property>
-                <property name="selectable">True</property>
-                <property 
name="mnemonic_widget">GNUNET_GTK_save_as_dialog_anonymity_spin_button</property>
-              </object>
-              <packing>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkSpinButton" 
id="GNUNET_GTK_save_as_dialog_anonymity_spin_button">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="invisible_char">●</property>
-                <property name="caps_lock_warning">False</property>
-                <property 
name="adjustment">GNUNET_GTK_anonymity_adjustment</property>
-                <property name="numeric">True</property>
-                <signal name="value-changed" 
handler="GNUNET_GTK_anonymity_spin_button_value_changed_cb" after="yes" 
swapped="no"/>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkCheckButton" 
id="GNUNET_GTK_save_as_recursive_check_button">
-                <property name="label" translatable="yes">_recursive</property>
-                <property name="visible">True</property>
-                <property name="sensitive">False</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">False</property>
-                <property name="use_action_appearance">False</property>
-                <property name="use_underline">True</property>
-                <property name="draw_indicator">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">2</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">False</property>
-            <property name="padding">8</property>
-            <property name="position">2</property>
-          </packing>
-        </child>
-        <child internal-child="action_area">
-          <object class="GtkHButtonBox" id="dialog-action_area5">
-            <property name="visible">True</property>
-            <property name="layout_style">end</property>
-            <child>
-              <object class="GtkButton" 
id="GNUNET_GTK_save_as_dialog_cancel_button">
-                <property name="label">gtk-cancel</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">False</property>
-                <property name="use_action_appearance">False</property>
-                <property name="use_stock">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkButton" 
id="GNUNET_GTK_save_as_dialog_ok_button">
-                <property name="label">gtk-save</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="can_default">True</property>
-                <property name="has_default">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
-                <property name="use_stock">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="pack_type">end</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-    <action-widgets>
-      <action-widget 
response="-6">GNUNET_GTK_save_as_dialog_cancel_button</action-widget>
-      <action-widget 
response="-5">GNUNET_GTK_save_as_dialog_ok_button</action-widget>
-    </action-widgets>
-  </object>
-</interface>

Copied: gnunet-gtk/contrib/gnunet_fs_gtk_about_dialog.glade (from rev 16478, 
gnunet-gtk/contrib/about.glade)
===================================================================
--- gnunet-gtk/contrib/gnunet_fs_gtk_about_dialog.glade                         
(rev 0)
+++ gnunet-gtk/contrib/gnunet_fs_gtk_about_dialog.glade 2011-08-15 14:20:33 UTC 
(rev 16549)
@@ -0,0 +1,370 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <requires lib="gtk+" version="2.20"/>
+  <!-- interface-naming-policy project-wide -->
+  <object class="GtkAboutDialog" id="GNUNET_GTK_about_dialog">
+    <property name="border_width">5</property>
+    <property name="title" translatable="yes">About gnunet-gtk</property>
+    <property name="modal">True</property>
+    <property name="window_position">center</property>
+    <property name="type_hint">normal</property>
+    <property name="skip_taskbar_hint">True</property>
+    <property name="skip_pager_hint">True</property>
+    <property name="urgency_hint">True</property>
+    <property name="has_separator">False</property>
+    <property name="program_name">gnunet-gtk</property>
+    <property name="version">0.9.0</property>
+    <property name="copyright" translatable="yes">(C) 2010 The GNUnet 
Project</property>
+    <property name="website">https://gnunet.org/</property>
+    <property name="license" translatable="yes">                    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
+</property>
+    <property name="authors">Juergen Appel &lt;address@hidden&gt;
+Krista Grothoff &lt;address@hidden&gt;
+James Blackwell &lt;address@hidden&gt;
+Ludovic Courtes &lt;address@hidden&gt;
+Nils Durner &lt;address@hidden&gt;
+Renaldo Ferreira &lt;address@hidden&gt;
+Christian Grothoff &lt;address@hidden&gt;
+Eric Haumant
+Tzvetan Horozov &lt;address@hidden&gt;
+Gerd Knorr &lt;address@hidden&gt;
+Werner Koch &lt;address@hidden&gt;
+Uli Luckas &lt;address@hidden&gt;
+Blake Matheny
+Glenn McGrath
+Hendrik Pagenhardt &lt;address@hidden&gt;
+Ioana Patrascu &lt;address@hidden&gt;
+Marko Raeihae
+Paul Ruth &lt;address@hidden&gt;
+Risto Saarelma
+Antti Salonen
+Tiberius Stef &lt;address@hidden&gt;
+Tuomas Toivonen
+Tomi Tukiainen
+Kevin Vandersloot &lt;address@hidden&gt;
+Simo Viitanen
+Larry Waldo
+Igor Wronsky &lt;address@hidden&gt;
+&lt;address@hidden&gt;
+</property>
+    <property name="documenters">Christian Grothoff &lt;address@hidden&gt;
+Nils Durner &lt;address@hidden&gt;</property>
+    <property name="translator_credits" translatable="yes" 
comments="TRANSLATORS: Replace this string with your names, one name per 
line.">Di Ma
+Jens Palsberg &lt;address@hidden&gt;
+Christian Grothoff &lt;address@hidden&gt;
+Nils Durner &lt;address@hidden&gt;
+Mathieu &lt;address@hidden&gt;
+Eric Haumant
address@hidden
+Hiroshi Yamauchi &lt;address@hidden&gt;
+Adam Welc &lt;address@hidden&gt;
+Bogdan Carbunar &lt;address@hidden&gt;
+Steven Michael Murphy &lt;address@hidden&gt;
+Phan Vinh Thinh &lt;address@hidden&gt;
+Daniel Nylander &lt;address@hidden&gt;
+</property>
+    <property name="artists">Christian Muellner &lt;address@hidden&gt;
+Alex Jones &lt;address@hidden&gt;</property>
+    <property name="logo">gnunet_logo.png</property>
+    <child internal-child="vbox">
+      <object class="GtkVBox" id="vbox">
+        <property name="visible">True</property>
+        <property name="spacing">2</property>
+        <child>
+          <placeholder/>
+        </child>
+        <child internal-child="action_area">
+          <object class="GtkHButtonBox" id="dialog-action_area1">
+            <property name="visible">True</property>
+            <property name="layout_style">end</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="pack_type">end</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+  </object>
+</interface>

Copied: gnunet-gtk/contrib/gnunet_fs_gtk_advertise_pseudonym_dialog.glade (from 
rev 16478, gnunet-gtk/contrib/advertise_pseudonym_dialog.glade)
===================================================================
--- gnunet-gtk/contrib/gnunet_fs_gtk_advertise_pseudonym_dialog.glade           
                (rev 0)
+++ gnunet-gtk/contrib/gnunet_fs_gtk_advertise_pseudonym_dialog.glade   
2011-08-15 14:20:33 UTC (rev 16549)
@@ -0,0 +1,722 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <requires lib="gtk+" version="2.20"/>
+  <!-- interface-naming-policy project-wide -->
+  <object class="GtkAdjustment" id="expiration_year_adjustment">
+    <property name="upper">9999</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">5</property>
+  </object>
+  <object class="GtkAdjustment" id="priority_adjustment">
+    <property name="upper">10000000</property>
+    <property name="value">1000</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
+  <object class="GtkAdjustment" id="GNUNET_GTK_anonymity_adjustment">
+    <property name="upper">100000</property>
+    <property name="value">1</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
+  <object class="GtkListStore" id="GNUNET_GTK_keyword_list_store">
+    <columns>
+      <!-- column-name keyword -->
+      <column type="gchararray"/>
+    </columns>
+  </object>
+  <object class="GtkDialog" id="GNUNET_GTK_advertise_pseudonym_dialog">
+    <property name="border_width">5</property>
+    <property name="title" translatable="yes">Advertise namespace</property>
+    <property name="destroy_with_parent">True</property>
+    <property name="type_hint">dialog</property>
+    <property name="skip_taskbar_hint">True</property>
+    <property name="has_separator">False</property>
+    <child internal-child="vbox">
+      <object class="GtkVBox" id="GNUNET_GTK_advertise_pseudonym_master_vbox">
+        <property name="visible">True</property>
+        <property name="spacing">2</property>
+        <child>
+          <object class="GtkHBox" 
id="GNUNET_GTK_advertise_pseudonym_metadata_hbox">
+            <property name="visible">True</property>
+            <child>
+              <object class="GtkVBox" 
id="GNUNET_GTK_advertise_pseudonym_metadata_vbox">
+                <property name="visible">True</property>
+                <property name="spacing">5</property>
+                <child>
+                  <object class="GtkHBox" 
id="GNUNET_GTK_advertise_pseudonym_metadata_edit_hbox">
+                    <property name="visible">True</property>
+                    <child>
+                      <object class="GtkLabel" 
id="GNUNET_GTK_advertise_pseudonym_metadata_type_label">
+                        <property name="visible">True</property>
+                        <property name="label" 
translatable="yes">Type:</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkScrolledWindow" 
id="GNUNET_GTK_advertise_pseudonym_metadata_type_scrolled_window">
+                        <property name="height_request">100</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="hscrollbar_policy">never</property>
+                        <property name="vscrollbar_policy">automatic</property>
+                        <child>
+                          <object class="GtkTreeView" 
id="GNUNET_GTK_advertise_pseudonym_metadata_type_tree_view">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property 
name="model">GNUNET_GTK_metatype_list_store</property>
+                            <property name="headers_visible">False</property>
+                            <property name="headers_clickable">False</property>
+                            <property name="reorderable">True</property>
+                            <property name="enable_search">False</property>
+                            <property name="tooltip_column">2</property>
+                            <child>
+                              <object class="GtkTreeViewColumn" 
id="GNUNET_GTK_advertise_pseudonym_metadata_type_tree_view_column">
+                                <property name="title" 
translatable="yes">Value</property>
+                                <property name="sort_column_id">0</property>
+                                <child>
+                                  <object class="GtkCellRendererText" 
id="GNUNET_GTK_advertise_pseudonym_metadata_type_tree_view_renderer"/>
+                                  <attributes>
+                                    <attribute name="text">0</attribute>
+                                  </attributes>
+                                </child>
+                              </object>
+                            </child>
+                          </object>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkLabel" 
id="GNUNET_GTK_advertise_pseudonym_metadata_value_label">
+                        <property name="visible">True</property>
+                        <property name="label" 
translatable="yes">Value:</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="padding">5</property>
+                        <property name="position">2</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkEntry" 
id="GNUNET_GTK_advertise_pseudonym_metadata_value_entry">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="invisible_char">●</property>
+                        <signal name="changed" 
handler="GNUNET_GTK_advertise_pseudonym_metadata_value_entry_changed_cb" 
swapped="no"/>
+                      </object>
+                      <packing>
+                        <property name="position">3</property>
+                      </packing>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkScrolledWindow" 
id="GNUNET_GTK_advertise_pseudonym_metadata_scrolled_window">
+                    <property name="width_request">400</property>
+                    <property name="height_request">120</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="hadjustment">adjustment1</property>
+                    <property name="vadjustment">adjustment2</property>
+                    <property name="hscrollbar_policy">automatic</property>
+                    <property name="vscrollbar_policy">automatic</property>
+                    <child>
+                      <object class="GtkTreeView" 
id="GNUNET_GTK_advertise_pseudonym_metadata_tree_view">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property 
name="model">GNUNET_GTK_meta_data_list_store</property>
+                        <property name="hadjustment">adjustment1</property>
+                        <property name="vadjustment">adjustment2</property>
+                        <property name="enable_search">False</property>
+                        <child>
+                          <object class="GtkTreeViewColumn" 
id="GNUNET_GTK_advertise_pseudonym_metadata_tree_view_type_column">
+                            <property name="sizing">fixed</property>
+                            <property name="fixed_width">120</property>
+                            <property name="title" 
translatable="yes">Type</property>
+                            <property name="reorderable">True</property>
+                            <property name="sort_column_id">2</property>
+                            <child>
+                              <object class="GtkCellRendererText" 
id="GNUNET_GTK_advertise_pseudonym_metadata_tree_view_type_renderer"/>
+                              <attributes>
+                                <attribute name="text">2</attribute>
+                              </attributes>
+                            </child>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkTreeViewColumn" 
id="GNUNET_GTK_advertise_pseudonym_metadata_tree_view_description_column">
+                            <property name="title" 
translatable="yes">Value</property>
+                            <property name="expand">True</property>
+                            <property name="reorderable">True</property>
+                            <property name="sort_column_id">3</property>
+                            <child>
+                              <object class="GtkCellRendererText" 
id="GNUNET_GTK_advertise_pseudonym_metadata_tree_view_value_renderer"/>
+                              <attributes>
+                                <attribute name="text">3</attribute>
+                              </attributes>
+                            </child>
+                          </object>
+                        </child>
+                      </object>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkVBox" 
id="GNUNET_GTK_advertise_pseudonym_metadata_button_vbox">
+                <property name="visible">True</property>
+                <child>
+                  <object class="GtkButton" 
id="GNUNET_GTK_advertise_pseudonym_metadata_add_button">
+                    <property name="label">gtk-add</property>
+                    <property name="visible">True</property>
+                    <property name="sensitive">False</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">True</property>
+                    <property name="use_action_appearance">False</property>
+                    <property name="use_stock">True</property>
+                    <signal name="clicked" 
handler="GNUNET_GTK_advertise_pseudonym_metadata_add_button_clicked_cb" 
swapped="no"/>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkButton" 
id="GNUNET_GTK_advertise_pseudonym_metadata_delete_button">
+                    <property name="label">gtk-delete</property>
+                    <property name="visible">True</property>
+                    <property name="sensitive">False</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">True</property>
+                    <property name="use_action_appearance">False</property>
+                    <property name="use_stock">True</property>
+                    <signal name="clicked" 
handler="GNUNET_GTK_advertise_pseudonym_metadata_delete_button_clicked_cb" 
swapped="no"/>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="padding">5</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" 
id="GNUNET_GTK_advertise_pseudonym_metadata_preview_label">
+                    <property name="visible">True</property>
+                    <property name="label" 
translatable="yes">Preview:</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="padding">10</property>
+                    <property name="position">2</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkImage" 
id="GNUNET_GTK_advertise_pseudonym_metadata_preview_image">
+                    <property name="sensitive">False</property>
+                    <property name="stock">gtk-missing-image</property>
+                  </object>
+                  <packing>
+                    <property name="position">3</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkFileChooserButton" 
id="GNUNET_GTK_advertise_pseudonym_metadata_preview_file_chooser_button">
+                    <property name="create_folders">False</property>
+                    <property name="title" translatable="yes">Select 
file</property>
+                    <signal name="file-set" 
handler="GNUNET_GTK_advertise_pseudonym_metadata_preview_file_chooser_button_file_set_cb"
 swapped="no"/>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">4</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="padding">5</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkHBox" 
id="GNUNET_GTK_advertise_pseudonym_secondary_hbox">
+            <property name="visible">True</property>
+            <child>
+              <object class="GtkVBox" 
id="GNUNET_GTK_advertise_pseudonym_keyword_entry_vbox">
+                <property name="visible">True</property>
+                <child>
+                  <object class="GtkHBox" 
id="GNUNET_GTK_advertise_pseudonym_keyword_hbox">
+                    <property name="visible">True</property>
+                    <child>
+                      <object class="GtkLabel" 
id="GNUNET_GTK_advertise_pseudonym_keyword_label">
+                        <property name="visible">True</property>
+                        <property name="label" 
translatable="yes">_Keyword:</property>
+                        <property name="use_underline">True</property>
+                        <property 
name="mnemonic_widget">GNUNET_GTK_advertise_pseudonym_keyword_entry</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkEntry" 
id="GNUNET_GTK_advertise_pseudonym_keyword_entry">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="invisible_char">●</property>
+                        <property name="caps_lock_warning">False</property>
+                        <signal name="changed" 
handler="GNUNET_GTK_advertise_pseudonym_keyword_entry_changed_cb" swapped="no"/>
+                        <signal name="activate" 
handler="GNUNET_GTK_advertise_pseudonym_keyword_entry_activate_cb" 
swapped="no"/>
+                      </object>
+                      <packing>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="padding">5</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkHBox" 
id="GNUNET_GTK_advertise_pseudonym_keyword_list_hbox">
+                    <property name="visible">True</property>
+                    <child>
+                      <object class="GtkScrolledWindow" 
id="GNUNET_GTK_advertise_pseudonym_keyword_scrolled_window">
+                        <property name="width_request">400</property>
+                        <property name="height_request">120</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="hadjustment">adjustment3</property>
+                        <property name="vadjustment">adjustment4</property>
+                        <property name="hscrollbar_policy">never</property>
+                        <property name="vscrollbar_policy">automatic</property>
+                        <child>
+                          <object class="GtkTreeView" 
id="GNUNET_GTK_advertise_pseudonym_keyword_list_tree_view">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property 
name="model">GNUNET_GTK_keyword_list_store</property>
+                            <property name="hadjustment">adjustment3</property>
+                            <property name="vadjustment">adjustment4</property>
+                            <property name="search_column">0</property>
+                            <child>
+                              <object class="GtkTreeViewColumn" 
id="GNUNET_GTK_advertise_pseudonym_keyword_list_tree_view_column">
+                                <property name="title" 
translatable="yes">Keywords</property>
+                                <property name="reorderable">True</property>
+                                <property name="sort_column_id">0</property>
+                                <child>
+                                  <object class="GtkCellRendererText" 
id="GNUNET_GTK_advertise_pseudonym_keyword_list_tree_view_renderer"/>
+                                  <attributes>
+                                    <attribute name="text">0</attribute>
+                                  </attributes>
+                                </child>
+                              </object>
+                            </child>
+                          </object>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkVBox" 
id="GNUNET_GTK_advertise_pseudonym_keyword_list_button_vbox">
+                        <property name="visible">True</property>
+                        <child>
+                          <object class="GtkButton" 
id="GNUNET_GTK_advertise_pseudonym_keyword_list_add_button">
+                            <property name="label">gtk-add</property>
+                            <property name="visible">True</property>
+                            <property name="sensitive">False</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">True</property>
+                            <property 
name="use_action_appearance">False</property>
+                            <property name="use_stock">True</property>
+                            <signal name="clicked" 
handler="GNUNET_GTK_advertise_pseudonym_keyword_list_add_button_clicked_cb" 
swapped="no"/>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkButton" 
id="GNUNET_GTK_advertise_pseudonym_keyword_list_del_button">
+                            <property name="label">gtk-delete</property>
+                            <property name="visible">True</property>
+                            <property name="sensitive">False</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">True</property>
+                            <property 
name="use_action_appearance">False</property>
+                            <property name="use_stock">True</property>
+                            <signal name="clicked" 
handler="GNUNET_GTK_advertise_pseudonym_keyword_list_del_button_clicked_cb" 
swapped="no"/>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="padding">5</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkButton" 
id="GNUNET_GTK_advertise_pseudonym_keyword_list_normalize_button">
+                            <property name="label" 
translatable="yes">_Normalize</property>
+                            <property name="sensitive">False</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">True</property>
+                            <property 
name="use_action_appearance">False</property>
+                            <property name="use_underline">True</property>
+                            <signal name="clicked" 
handler="GNUNET_GTK_advertise_pseudonym_keyword_list_normalize_button_clicked_cb"
 swapped="no"/>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">2</property>
+                          </packing>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="padding">5</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="padding">5</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkVBox" 
id="GNUNET_GTK_advertise_pseudonym_misc_vbox">
+                <property name="visible">True</property>
+                <child>
+                  <object class="GtkLabel" 
id="GNUNET_GTK_advertise_pseudonym_options_label">
+                    <property name="visible">True</property>
+                    <property name="label" 
translatable="yes">Options</property>
+                    <property name="justify">center</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="padding">5</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkHSeparator" id="hseparator3">
+                    <property name="visible">True</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="padding">5</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkHBox" 
id="GNUNET_GTK_advertise_pseudonym_anonymity_hbox">
+                    <property name="visible">True</property>
+                    <child>
+                      <object class="GtkLabel" 
id="GNUNET_GTK_advertise_pseudonym_anonymity_label">
+                        <property name="visible">True</property>
+                        <property name="label" 
translatable="yes">_Anonymity:</property>
+                        <property name="use_underline">True</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="padding">5</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkSpinButton" 
id="GNUNET_GTK_advertise_pseudonym_anonymity_spin_button">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="tooltip_markup">Anonymity of zero 
means no anonymity.  Values larger than one require GNUnet to have cover 
traffic (with larger values implying more cover traffic).</property>
+                        <property name="invisible_char">●</property>
+                        <property 
name="adjustment">GNUNET_GTK_anonymity_adjustment</property>
+                        <signal name="value-changed" 
handler="GNUNET_GTK_anonymity_spin_button_value_changed_cb" after="yes" 
swapped="no"/>
+                      </object>
+                      <packing>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">2</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkHSeparator" id="hseparator1">
+                    <property name="visible">True</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">3</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkHBox" 
id="GNUNET_GTK_advertise_pseudonym_priority_hbox">
+                    <property name="visible">True</property>
+                    <child>
+                      <object class="GtkLabel" 
id="GNUNET_GTK_advertise_pseudonym_priority_label">
+                        <property name="visible">True</property>
+                        <property name="label" 
translatable="yes">_Priority:</property>
+                        <property name="use_underline">True</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="padding">5</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkSpinButton" 
id="GNUNET_GTK_advertise_pseudonym_priority_spin_button">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="tooltip_markup">The content priority 
determines when content is discarded in favour of other, more popular content.  
</property>
+                        <property name="invisible_char">●</property>
+                        <property 
name="adjustment">priority_adjustment</property>
+                        <property name="numeric">True</property>
+                      </object>
+                      <packing>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">4</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkHSeparator" id="hseparator2">
+                    <property name="visible">True</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="position">5</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkHBox" id="hbox1">
+                    <property name="visible">True</property>
+                    <child>
+                      <object class="GtkLabel" 
id="GNUNET_GTK_advertise_pseudonym_root_label">
+                        <property name="visible">True</property>
+                        <property name="label" 
translatable="yes">_Root:</property>
+                        <property name="use_underline">True</property>
+                        <property name="selectable">True</property>
+                      </object>
+                      <packing>
+                        <property name="padding">5</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkEntry" 
id="GNUNET_GTK_advertise_pseudonym_root_entry">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="invisible_char">•</property>
+                        <property name="text" 
translatable="yes">root</property>
+                      </object>
+                      <packing>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="position">6</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkHSeparator" id="hseparator4">
+                    <property name="visible">True</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="position">7</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkHBox" id="hbox2">
+                    <property name="visible">True</property>
+                    <child>
+                      <object class="GtkLabel" 
id="GNUNET_GTK_advertise_pseudonym_expiration_label">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">_Expriation 
year:</property>
+                        <property name="use_underline">True</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="padding">5</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkSpinButton" 
id="GNUNET_GTK_advertise_pseudonym_expiration_year_spin_button">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="max_length">4</property>
+                        <property name="invisible_char">•</property>
+                        <property 
name="adjustment">expiration_year_adjustment</property>
+                        <property name="climb_rate">1</property>
+                        <property name="numeric">True</property>
+                      </object>
+                      <packing>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="position">8</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="padding">11</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="padding">5</property>
+            <property name="position">2</property>
+          </packing>
+        </child>
+        <child internal-child="action_area">
+          <object class="GtkHButtonBox" id="dialog-action_area13">
+            <property name="visible">True</property>
+            <property name="layout_style">end</property>
+            <child>
+              <object class="GtkButton" 
id="GNUNET_GTK_advertise_pseudonym_cancel_button">
+                <property name="label">gtk-cancel</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_action_appearance">False</property>
+                <property name="use_stock">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" 
id="GNUNET_GTK_advertise_pseudonym_confirm_button">
+                <property name="label">gtk-ok</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_action_appearance">False</property>
+                <property name="use_stock">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="pack_type">end</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+    <action-widgets>
+      <action-widget 
response="-6">GNUNET_GTK_advertise_pseudonym_cancel_button</action-widget>
+      <action-widget 
response="-5">GNUNET_GTK_advertise_pseudonym_confirm_button</action-widget>
+    </action-widgets>
+  </object>
+  <object class="GtkListStore" id="GNUNET_GTK_meta_data_list_store">
+    <columns>
+      <!-- column-name extractor_meta_type -->
+      <column type="guint"/>
+      <!-- column-name extractor_meta_format -->
+      <column type="guint"/>
+      <!-- column-name extractor_meta_type_string -->
+      <column type="gchararray"/>
+      <!-- column-name extracotr_meta_value -->
+      <column type="gchararray"/>
+    </columns>
+  </object>
+  <object class="GtkListStore" id="GNUNET_GTK_metatype_list_store">
+    <columns>
+      <!-- column-name description -->
+      <column type="gchararray"/>
+      <!-- column-name guint1 -->
+      <column type="guint"/>
+      <!-- column-name helptext -->
+      <column type="gchararray"/>
+    </columns>
+  </object>
+  <object class="GtkAdjustment" id="adjustment1">
+    <property name="upper">100</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+    <property name="page_size">10</property>
+  </object>
+  <object class="GtkAdjustment" id="adjustment2">
+    <property name="upper">100</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+    <property name="page_size">10</property>
+  </object>
+  <object class="GtkAdjustment" id="adjustment3">
+    <property name="upper">100</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+    <property name="page_size">10</property>
+  </object>
+  <object class="GtkAdjustment" id="adjustment4">
+    <property name="upper">100</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+    <property name="page_size">10</property>
+  </object>
+</interface>

Copied: gnunet-gtk/contrib/gnunet_fs_gtk_create_namespace_dialog.glade (from 
rev 16478, gnunet-gtk/contrib/create_namespace_dialog.glade)
===================================================================
--- gnunet-gtk/contrib/gnunet_fs_gtk_create_namespace_dialog.glade              
                (rev 0)
+++ gnunet-gtk/contrib/gnunet_fs_gtk_create_namespace_dialog.glade      
2011-08-15 14:20:33 UTC (rev 16549)
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <requires lib="gtk+" version="2.20"/>
+  <!-- interface-naming-policy project-wide -->
+  <object class="GtkDialog" id="GNUNET_GTK_create_namespace_dialog">
+    <property name="visible">True</property>
+    <property name="can_default">True</property>
+    <property name="border_width">5</property>
+    <property name="title" translatable="yes">Create namespace</property>
+    <property name="resizable">False</property>
+    <property name="modal">True</property>
+    <property name="window_position">center</property>
+    <property name="icon_name">folder-new</property>
+    <property name="type_hint">dialog</property>
+    <property name="skip_taskbar_hint">True</property>
+    <property name="has_separator">False</property>
+    <child internal-child="vbox">
+      <object class="GtkVBox" id="GNUNET_GTK_create_namespace_vbox">
+        <property name="visible">True</property>
+        <property name="spacing">2</property>
+        <child>
+          <object class="GtkHBox" id="GNUNET_GTK_create_namespace_value_hbox">
+            <property name="visible">True</property>
+            <child>
+              <object class="GtkLabel" 
id="GNUNET_GTK_create_namespace_name_label">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">_Name:</property>
+                <property name="use_underline">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="padding">4</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkEntry" 
id="GNUNET_GTK_create_namespace_name_entry">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="invisible_char">●</property>
+                <property name="activates_default">True</property>
+              </object>
+              <packing>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="padding">5</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child internal-child="action_area">
+          <object class="GtkHButtonBox" 
id="GNUNET_GTK_create_namespace_dialog-action_area">
+            <property name="visible">True</property>
+            <property name="layout_style">end</property>
+            <child>
+              <object class="GtkButton" 
id="GNUNET_GTK_create_namespace_cancel_button">
+                <property name="label">gtk-cancel</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_action_appearance">False</property>
+                <property name="use_stock">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" 
id="GNUNET_GTK_create_namespace_ok_button">
+                <property name="label">gtk-ok</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="has_default">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_action_appearance">False</property>
+                <property name="use_stock">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+    <action-widgets>
+      <action-widget 
response="-6">GNUNET_GTK_create_namespace_cancel_button</action-widget>
+      <action-widget 
response="-5">GNUNET_GTK_create_namespace_ok_button</action-widget>
+    </action-widgets>
+  </object>
+</interface>

Copied: gnunet-gtk/contrib/gnunet_fs_gtk_download_as_dialog.glade (from rev 
16478, gnunet-gtk/contrib/download_as.glade)
===================================================================
--- gnunet-gtk/contrib/gnunet_fs_gtk_download_as_dialog.glade                   
        (rev 0)
+++ gnunet-gtk/contrib/gnunet_fs_gtk_download_as_dialog.glade   2011-08-15 
14:20:33 UTC (rev 16549)
@@ -0,0 +1,134 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <requires lib="gtk+" version="2.20"/>
+  <!-- interface-naming-policy project-wide -->
+  <object class="GtkAdjustment" id="GNUNET_GTK_anonymity_adjustment">
+    <property name="upper">100000</property>
+    <property name="value">1</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
+  <object class="GtkFileChooserDialog" id="GNUNET_GTK_save_as_dialog">
+    <property name="can_default">True</property>
+    <property name="has_default">True</property>
+    <property name="border_width">5</property>
+    <property name="title" translatable="yes">Save file as...</property>
+    <property name="window_position">center-on-parent</property>
+    <property name="destroy_with_parent">True</property>
+    <property name="icon_name">document-save-as</property>
+    <property name="type_hint">dialog</property>
+    <property name="has_separator">False</property>
+    <property name="use_preview_label">False</property>
+    <property name="action">save</property>
+    <property name="preview_widget_active">False</property>
+    <child internal-child="vbox">
+      <object class="GtkVBox" id="dialog-vbox4">
+        <property name="visible">True</property>
+        <property name="spacing">2</property>
+        <child>
+          <object class="GtkHBox" id="hbox2">
+            <property name="visible">True</property>
+            <child>
+              <object class="GtkLabel" 
id="GNUNET_GTK_save_as_dialog_anonymity_label">
+                <property name="visible">True</property>
+                <property name="label" 
translatable="yes">_Anonymity:</property>
+                <property name="use_underline">True</property>
+                <property name="selectable">True</property>
+                <property 
name="mnemonic_widget">GNUNET_GTK_save_as_dialog_anonymity_spin_button</property>
+              </object>
+              <packing>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkSpinButton" 
id="GNUNET_GTK_save_as_dialog_anonymity_spin_button">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="invisible_char">●</property>
+                <property name="caps_lock_warning">False</property>
+                <property 
name="adjustment">GNUNET_GTK_anonymity_adjustment</property>
+                <property name="numeric">True</property>
+                <signal name="value-changed" 
handler="GNUNET_GTK_anonymity_spin_button_value_changed_cb" after="yes" 
swapped="no"/>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkCheckButton" 
id="GNUNET_GTK_save_as_recursive_check_button">
+                <property name="label" translatable="yes">_recursive</property>
+                <property name="visible">True</property>
+                <property name="sensitive">False</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">False</property>
+                <property name="use_action_appearance">False</property>
+                <property name="use_underline">True</property>
+                <property name="draw_indicator">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">2</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="padding">8</property>
+            <property name="position">2</property>
+          </packing>
+        </child>
+        <child internal-child="action_area">
+          <object class="GtkHButtonBox" id="dialog-action_area5">
+            <property name="visible">True</property>
+            <property name="layout_style">end</property>
+            <child>
+              <object class="GtkButton" 
id="GNUNET_GTK_save_as_dialog_cancel_button">
+                <property name="label">gtk-cancel</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">False</property>
+                <property name="use_action_appearance">False</property>
+                <property name="use_stock">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" 
id="GNUNET_GTK_save_as_dialog_ok_button">
+                <property name="label">gtk-save</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="has_default">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_action_appearance">False</property>
+                <property name="use_stock">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="pack_type">end</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+    <action-widgets>
+      <action-widget 
response="-6">GNUNET_GTK_save_as_dialog_cancel_button</action-widget>
+      <action-widget 
response="-5">GNUNET_GTK_save_as_dialog_ok_button</action-widget>
+    </action-widgets>
+  </object>
+</interface>

Copied: gnunet-gtk/contrib/gnunet_fs_gtk_main_tab_new_frame.glade (from rev 
16478, gnunet-gtk/contrib/main_tab_new_frame.glade)
===================================================================
--- gnunet-gtk/contrib/gnunet_fs_gtk_main_tab_new_frame.glade                   
        (rev 0)
+++ gnunet-gtk/contrib/gnunet_fs_gtk_main_tab_new_frame.glade   2011-08-15 
14:20:33 UTC (rev 16549)
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <requires lib="gtk+" version="2.20"/>
+  <!-- interface-naming-policy project-wide -->
+  <object class="GtkWindow" id="_main_tab_new_frame">
+    <child>
+      <object class="GtkButton" id="_main_tab_new_frame_new_button">
+        <property name="visible">True</property>
+        <property name="can_focus">True</property>
+        <property name="receives_default">True</property>
+        <property name="use_action_appearance">False</property>
+        <child>
+          <object class="GtkImage" id="new_stock_icon_image">
+            <property name="visible">True</property>
+            <property name="stock">gtk-new</property>
+            <property name="icon-size">2</property>
+          </object>
+        </child>
+      </object>
+    </child>
+  </object>
+</interface>

Copied: gnunet-gtk/contrib/gnunet_fs_gtk_main_window.glade (from rev 16478, 
gnunet-gtk/contrib/main-window.glade)
===================================================================
--- gnunet-gtk/contrib/gnunet_fs_gtk_main_window.glade                          
(rev 0)
+++ gnunet-gtk/contrib/gnunet_fs_gtk_main_window.glade  2011-08-15 14:20:33 UTC 
(rev 16549)
@@ -0,0 +1,538 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <requires lib="gtk+" version="2.20"/>
+  <!-- interface-naming-policy project-wide -->
+  <object class="GtkAdjustment" id="adjustment4">
+    <property name="upper">100</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+    <property name="page_size">10</property>
+  </object>
+  <object class="GtkAdjustment" id="adjustment3">
+    <property name="upper">100</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+    <property name="page_size">10</property>
+  </object>
+  <object class="GtkAdjustment" id="adjustment2">
+    <property name="upper">100</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+    <property name="page_size">10</property>
+  </object>
+  <object class="GtkAdjustment" id="adjustment1">
+    <property name="upper">100</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+    <property name="page_size">10</property>
+  </object>
+  <object class="GtkImage" id="image6">
+    <property name="visible">True</property>
+    <property name="stock">gtk-index</property>
+  </object>
+  <object class="GtkListStore" id="GNUNET_GTK_peer_info_list_store">
+    <columns>
+      <!-- column-name peer_identity -->
+      <column type="gchararray"/>
+      <!-- column-name number_of_known_addresses -->
+      <column type="guint"/>
+      <!-- column-name country_name -->
+      <column type="gchararray"/>
+      <!-- column-name country_flag -->
+      <column type="GdkPixbuf"/>
+      <!-- column-name bandwidth -->
+      <column type="guint64"/>
+    </columns>
+  </object>
+  <object class="GtkListStore" id="GNUNET_GTK_meta_data_list_store">
+    <columns>
+      <!-- column-name extractor_meta_type -->
+      <column type="guint"/>
+      <!-- column-name extractor_meta_format -->
+      <column type="guint"/>
+      <!-- column-name extractor_meta_type_string -->
+      <column type="gchararray"/>
+      <!-- column-name extracotr_meta_value -->
+      <column type="gchararray"/>
+    </columns>
+  </object>
+  <object class="GtkWindow" id="GNUNET_GTK_main_window">
+    <property name="title" translatable="yes">gnunet-gtk</property>
+    <property name="window_position">center</property>
+    <property name="default_width">700</property>
+    <property name="default_height">500</property>
+    <property name="icon_name">gnunet-gtk</property>
+    <signal name="delete-event" handler="GNUNET_GTK_quit_cb" after="yes" 
swapped="no"/>
+    <child>
+      <object class="GtkVBox" id="GNUNET_GTK_main_window_vbox">
+        <property name="visible">True</property>
+        <child>
+          <object class="GtkMenuBar" id="GNUNET_GTK_main_menu">
+            <property name="visible">True</property>
+            <child>
+              <object class="GtkMenuItem" 
id="GNUNET_GTK_main_menu_file_sharing">
+                <property name="visible">True</property>
+                <property name="use_action_appearance">False</property>
+                <property name="label" translatable="yes">_File 
sharing</property>
+                <property name="use_underline">True</property>
+                <child type="submenu">
+                  <object class="GtkMenu" 
id="GNUNET_GTK_main_menu_file_sharing_box">
+                    <property name="visible">True</property>
+                    <child>
+                      <object class="GtkImageMenuItem" 
id="GNUNET_GTK_main_menu_file_create_pseudonym">
+                        <property name="label" translatable="yes">_Create 
pseudonym</property>
+                        <property name="visible">True</property>
+                        <property name="tooltip_text" 
translatable="yes">Create a pseudonym for publishing content.  Note that you 
can also publish content anonymously (without using a pseudonym).</property>
+                        <property name="use_action_appearance">False</property>
+                        <property name="accel_path">&lt;gnunet-gtk&gt;/File 
sharing/Create pseudonym</property>
+                        <property name="use_underline">True</property>
+                        <property name="image">image3</property>
+                        <property name="use_stock">False</property>
+                        <accelerator key="n" signal="activate" 
modifiers="GDK_CONTROL_MASK"/>
+                        <signal name="activate" 
handler="GNUNET_GTK_main_menu_create_pseudonym_activate_cb" swapped="no"/>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkImageMenuItem" 
id="GNUNET_GTK_main_menu_file_advertise_pseudonym">
+                        <property name="label" translatable="yes">_Advertise 
Pseudonym</property>
+                        <property name="visible">True</property>
+                        <property name="use_action_appearance">False</property>
+                        <property name="use_underline">True</property>
+                        <property name="image">image6</property>
+                        <property name="use_stock">False</property>
+                        <signal name="activate" 
handler="GNUNET_GTK_main_menu_file_advertise_pseudonym_activate_cb" 
swapped="no"/>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkImageMenuItem" 
id="GNUNET_GTK_main_menu_file_publish">
+                        <property name="label" 
translatable="yes">_Publish</property>
+                        <property name="visible">True</property>
+                        <property name="tooltip_text" 
translatable="yes">Publish files or directories on GNUnet</property>
+                        <property name="use_action_appearance">False</property>
+                        <property name="accel_path">&lt;gnunet-gtk&gt;/File 
sharing/Publish</property>
+                        <property name="use_underline">True</property>
+                        <property name="image">image2</property>
+                        <property name="use_stock">False</property>
+                        <accelerator key="a" signal="activate" 
modifiers="GDK_CONTROL_MASK"/>
+                        <signal name="activate" 
handler="GNUNET_GTK_main_menu_file_publish_activate_cb" swapped="no"/>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkSeparatorMenuItem" 
id="GNUNET_GTK_main_menu_file_sep1">
+                        <property name="visible">True</property>
+                        <property name="use_action_appearance">False</property>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkImageMenuItem" 
id="GNUNET_GTK_main_menu_file_search">
+                        <property name="label" 
translatable="yes">_Search</property>
+                        <property name="visible">True</property>
+                        <property name="tooltip_text" 
translatable="yes">Search GNUnet for files</property>
+                        <property name="use_action_appearance">False</property>
+                        <property name="accel_path">&lt;gnunet-gtk&gt;/File 
sharing/Search</property>
+                        <property name="use_underline">True</property>
+                        <property name="image">image4</property>
+                        <property name="use_stock">False</property>
+                        <accelerator key="s" signal="activate" 
modifiers="GDK_CONTROL_MASK"/>
+                        <signal name="activate" 
handler="GNUNET_GTK_main_menu_file_search_activate_cb" swapped="no"/>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkSeparatorMenuItem" 
id="GNUNET_GTK_main_menu_file_sep2">
+                        <property name="visible">True</property>
+                        <property name="use_action_appearance">False</property>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkImageMenuItem" 
id="GNUNET_GTK_main_menu_file_download_uri">
+                        <property name="label" 
translatable="yes">_Download</property>
+                        <property name="visible">True</property>
+                        <property name="tooltip_text" 
translatable="yes">Download a file or directory with a known URI.</property>
+                        <property name="use_action_appearance">False</property>
+                        <property name="accel_path">&lt;gnunet-gtk&gt;/File 
sharing/Download</property>
+                        <property name="use_underline">True</property>
+                        <property name="image">image5</property>
+                        <property name="use_stock">False</property>
+                        <accelerator key="d" signal="activate" 
modifiers="GDK_CONTROL_MASK"/>
+                        <signal name="activate" 
handler="GNUNET_GTK_main_menu_file_download_uri_activate_cb" swapped="no"/>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkImageMenuItem" 
id="GNUNET_GTK_main_menu_file_open_gnunet_directory">
+                        <property name="label" translatable="yes">_Open GNUnet 
directory</property>
+                        <property name="visible">True</property>
+                        <property name="tooltip_text" translatable="yes">Use 
this option to browse a GNUnet directory file that has been previously 
downloaded.</property>
+                        <property name="use_action_appearance">False</property>
+                        <property name="accel_path">&lt;gnunet-gtk&gt;/File 
sharing/Open directory</property>
+                        <property name="use_underline">True</property>
+                        <property name="image">image1</property>
+                        <property name="use_stock">False</property>
+                        <accelerator key="F3" signal="activate"/>
+                        <signal name="activate" 
handler="GNUNET_GTK_main_menu_file_open_gnunet_directory_activate_cb" 
swapped="no"/>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkSeparatorMenuItem" 
id="GNUNET_GTK_main_menu_file_sep3">
+                        <property name="visible">True</property>
+                        <property name="use_action_appearance">False</property>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkImageMenuItem" 
id="GNUNET_GTK_main_menu_file_quit">
+                        <property name="label">gtk-quit</property>
+                        <property name="visible">True</property>
+                        <property name="tooltip_text" translatable="yes">Exit 
gnunet-gtk.  Active file-sharing operations will resume upon restart.</property>
+                        <property name="use_action_appearance">False</property>
+                        <property 
name="accel_path">&lt;gnunet-gtk&gt;/Quit</property>
+                        <property name="use_underline">True</property>
+                        <property name="use_stock">True</property>
+                        <accelerator key="q" signal="activate" 
modifiers="GDK_CONTROL_MASK"/>
+                        <signal name="activate" handler="GNUNET_GTK_quit_cb" 
swapped="no"/>
+                      </object>
+                    </child>
+                  </object>
+                </child>
+              </object>
+            </child>
+            <child>
+              <object class="GtkMenuItem" id="GNUNET_GTK_main_menu_edit">
+                <property name="use_action_appearance">False</property>
+                <property name="label" translatable="yes">_Edit</property>
+                <property name="use_underline">True</property>
+                <child type="submenu">
+                  <object class="GtkMenu" id="GNUNET_GTK_main_menu_edit_box">
+                    <property name="visible">True</property>
+                    <child>
+                      <object class="GtkImageMenuItem" 
id="GNUNET_GTK_main_menu_edit_preferences">
+                        <property name="label">gtk-preferences</property>
+                        <property name="visible">True</property>
+                        <property name="tooltip_text" translatable="yes">Edit 
the system configuration.</property>
+                        <property name="use_action_appearance">False</property>
+                        <property 
name="accel_path">&lt;gnunet-gtk&gt;/Edit/Preferences</property>
+                        <property name="use_underline">True</property>
+                        <property name="use_stock">True</property>
+                      </object>
+                    </child>
+                  </object>
+                </child>
+              </object>
+            </child>
+            <child>
+              <object class="GtkMenuItem" id="GNUNET_GTK_main_menu_view">
+                <property name="visible">True</property>
+                <property name="use_action_appearance">False</property>
+                <property name="label" translatable="yes">_View</property>
+                <property name="use_underline">True</property>
+                <child type="submenu">
+                  <object class="GtkMenu" id="GNUNET_GTK_main_menu_view_box">
+                    <property name="visible">True</property>
+                    <child>
+                      <object class="GtkCheckMenuItem" 
id="GNUNET_GTK_main_menu_view_metadata">
+                        <property name="visible">True</property>
+                        <property name="tooltip_text" translatable="yes">Show 
meta data in main window</property>
+                        <property name="use_action_appearance">False</property>
+                        <property name="label" 
translatable="yes">Metadata</property>
+                        <property name="use_underline">True</property>
+                        <property name="active">True</property>
+                        <signal name="toggled" 
handler="GNUNET_GTK_main_menu_view_metadata_toggled_cb" swapped="no"/>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkCheckMenuItem" 
id="GNUNET_GTK_main_menu_view_neighbours">
+                        <property name="visible">True</property>
+                        <property name="tooltip_text" 
translatable="yes">Activates the panel showing information about known and 
connected peers</property>
+                        <property name="use_action_appearance">False</property>
+                        <property name="label" 
translatable="yes">Neighbours</property>
+                        <property name="use_underline">True</property>
+                        <property name="active">True</property>
+                        <signal name="toggled" 
handler="GNUNET_GTK_main_menu_view_neighbours_toggled_cb" swapped="no"/>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkCheckMenuItem" 
id="GNUNET_GTK_main_menu_view_preview">
+                        <property name="visible">True</property>
+                        <property name="tooltip_text" translatable="yes">Show 
preview (when available)</property>
+                        <property name="use_action_appearance">False</property>
+                        <property name="label" 
translatable="yes">Preview</property>
+                        <property name="use_underline">True</property>
+                        <property name="active">True</property>
+                        <signal name="toggled" 
handler="GNUNET_GTK_main_menu_view_preview_toggled_cb" swapped="no"/>
+                      </object>
+                    </child>
+                  </object>
+                </child>
+              </object>
+            </child>
+            <child>
+              <object class="GtkMenuItem" id="GNUNET_GTK_main_menu_help">
+                <property name="visible">True</property>
+                <property name="use_action_appearance">False</property>
+                <property name="label" translatable="yes">_Help</property>
+                <property name="use_underline">True</property>
+                <child type="submenu">
+                  <object class="GtkMenu" id="GNUNET_GTK_main_menu_help_abou">
+                    <property name="visible">True</property>
+                    <child>
+                      <object class="GtkImageMenuItem" 
id="GNUNET_GTK_main_menu_help_about">
+                        <property name="label">gtk-about</property>
+                        <property name="visible">True</property>
+                        <property name="tooltip_text" 
translatable="yes">Display information about this version of 
gnunet-gtk</property>
+                        <property name="use_action_appearance">False</property>
+                        <property 
name="accel_path">&lt;gnunet-gtk&gt;/Help/About</property>
+                        <property name="use_underline">True</property>
+                        <property name="use_stock">True</property>
+                        <signal name="activate" 
handler="GNUNET_GTK_main_menu_help_about_activate_cb" swapped="no"/>
+                      </object>
+                    </child>
+                  </object>
+                </child>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkToolbar" id="GNUNET_GTK_main_window_toolbar">
+            <property name="toolbar_style">icons</property>
+            <child>
+              <object class="GtkToolButton" id="GNUNET_GTK_toolbar_search">
+                <property name="visible">True</property>
+                <property name="use_action_appearance">False</property>
+                <property name="label" translatable="yes">_Search</property>
+                <property name="use_underline">True</property>
+                <property name="stock_id">gtk-find</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="homogeneous">True</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="position">2</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkHBox" id="GNUNET_GTK_main_window_hbox">
+            <property name="visible">True</property>
+            <child>
+              <object class="GtkNotebook" id="GNUNET_GTK_main_window_notebook">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="scrollable">True</property>
+                <signal name="switch-page" 
handler="GNUNET_GTK_main_window_notebook_switch_page_cb" after="yes" 
swapped="no"/>
+              </object>
+              <packing>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkVSeparator" 
id="GNUNET_GTK_main_window_separator">
+                <property name="visible">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkVBox" id="GNUNET_GTK_main_window_extras_vbox">
+                <property name="visible">True</property>
+                <child>
+                  <object class="GtkImage" 
id="GNUNET_GTK_main_window_preview_image">
+                    <property name="width_request">128</property>
+                    <property name="height_request">128</property>
+                    <property name="visible">True</property>
+                    <property name="sensitive">False</property>
+                    <property name="has_tooltip">True</property>
+                    <property name="tooltip_text" translatable="yes">Thumbnail 
associated with the currently selected content</property>
+                    <property name="pixel_size">256</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkScrolledWindow" 
id="GNUNET_GTK_main_window_metadata_scroll">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="hadjustment">adjustment1</property>
+                    <property name="vadjustment">adjustment2</property>
+                    <property name="hscrollbar_policy">automatic</property>
+                    <property name="vscrollbar_policy">automatic</property>
+                    <child>
+                      <object class="GtkTreeView" 
id="GNUNET_GTK_main_window_metadata_treeview">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property 
name="model">GNUNET_GTK_meta_data_list_store</property>
+                        <property name="hadjustment">adjustment1</property>
+                        <property name="vadjustment">adjustment2</property>
+                        <property name="search_column">0</property>
+                        <property name="enable_grid_lines">both</property>
+                        <child>
+                          <object class="GtkTreeViewColumn" 
id="GNUNET_GTK_main_window_metadata_type_column">
+                            <property name="sizing">autosize</property>
+                            <property name="title" 
translatable="yes">Type</property>
+                            <property name="clickable">True</property>
+                            <property name="reorderable">True</property>
+                            <property name="sort_indicator">True</property>
+                            <child>
+                              <object class="GtkCellRendererText" 
id="GNUNET_GTK_main_window_metadata_type_renderer"/>
+                              <attributes>
+                                <attribute name="text">2</attribute>
+                              </attributes>
+                            </child>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkTreeViewColumn" 
id="GNUNET_GTK_main_window_metadata_value_column">
+                            <property name="sizing">autosize</property>
+                            <property name="title" 
translatable="yes">Value</property>
+                            <property name="expand">True</property>
+                            <property name="clickable">True</property>
+                            <property name="reorderable">True</property>
+                            <property name="sort_indicator">True</property>
+                            <child>
+                              <object class="GtkCellRendererText" 
id="GNUNET_GTK_main_window_metadata_value_renderer">
+                                <property name="sensitive">False</property>
+                                <property name="wrap_mode">word</property>
+                              </object>
+                              <attributes>
+                                <attribute name="text">3</attribute>
+                              </attributes>
+                            </child>
+                          </object>
+                        </child>
+                      </object>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkScrolledWindow" 
id="GNUNET_GTK_main_window_peerinfo_scroll">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="hadjustment">adjustment3</property>
+                    <property name="vadjustment">adjustment4</property>
+                    <property name="hscrollbar_policy">automatic</property>
+                    <property name="vscrollbar_policy">automatic</property>
+                    <child>
+                      <object class="GtkTreeView" 
id="GNUNET_GTK_main_window_peerinfo_treeview">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property 
name="model">GNUNET_GTK_peer_info_list_store</property>
+                        <property name="hadjustment">adjustment3</property>
+                        <property name="vadjustment">adjustment4</property>
+                        <property name="headers_clickable">False</property>
+                        <property name="reorderable">True</property>
+                        <property name="search_column">0</property>
+                        <child>
+                          <object class="GtkTreeViewColumn" 
id="GNUNET_GTK_main_window_peerinfo_name_column">
+                            <property name="sizing">autosize</property>
+                            <property name="title" 
translatable="yes">Peer</property>
+                            <property name="expand">True</property>
+                            <property name="clickable">True</property>
+                            <property name="reorderable">True</property>
+                            <property name="sort_column_id">0</property>
+                            <child>
+                              <object class="GtkCellRendererText" 
id="GNUNET_GTK_main_window_peerinfo_name_renderer">
+                                <property name="sensitive">False</property>
+                                <property name="width_chars">16</property>
+                              </object>
+                              <attributes>
+                                <attribute name="text">0</attribute>
+                              </attributes>
+                            </child>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkTreeViewColumn" 
id="GNUNET_GTK_main_window_peerinfo_bandwidth_column">
+                            <property name="sizing">autosize</property>
+                            <property name="title" 
translatable="yes">Bandwidth</property>
+                            <property name="sort_order">descending</property>
+                            <property name="sort_column_id">5</property>
+                            <child>
+                              <object class="GtkCellRendererText" 
id="GNUNET_GTK_main_window_peerinfo_bandwidth_renderer"/>
+                              <attributes>
+                                <attribute name="text">4</attribute>
+                              </attributes>
+                            </child>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkTreeViewColumn" 
id="GNUNET_GTK_main_window_peerinfo_country_column">
+                            <property name="sizing">autosize</property>
+                            <property name="title" 
translatable="yes">Country</property>
+                            <property name="clickable">True</property>
+                            <property name="reorderable">True</property>
+                            <property name="sort_indicator">True</property>
+                            <property name="sort_column_id">3</property>
+                            <child>
+                              <object class="GtkCellRendererPixbuf" 
id="GNUNET_GTK_main_window_peerinfo_country_renderer"/>
+                              <attributes>
+                                <attribute name="pixbuf">3</attribute>
+                              </attributes>
+                            </child>
+                          </object>
+                        </child>
+                      </object>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="position">2</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="position">2</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="position">3</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkStatusbar" id="GNUNET_GTK_status_bar">
+            <property name="visible">True</property>
+            <property name="spacing">2</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="pack_type">end</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+  </object>
+  <object class="GtkImage" id="image2">
+    <property name="visible">True</property>
+    <property name="stock">gtk-go-up</property>
+  </object>
+  <object class="GtkImage" id="image3">
+    <property name="visible">True</property>
+    <property name="stock">gtk-new</property>
+  </object>
+  <object class="GtkImage" id="image1">
+    <property name="visible">True</property>
+    <property name="stock">gtk-open</property>
+  </object>
+  <object class="GtkImage" id="image4">
+    <property name="visible">True</property>
+    <property name="stock">gtk-find</property>
+  </object>
+  <object class="GtkImage" id="image5">
+    <property name="visible">True</property>
+    <property name="stock">gtk-go-down</property>
+  </object>
+</interface>

Copied: gnunet-gtk/contrib/gnunet_fs_gtk_open_directory_dialog.glade (from rev 
16478, gnunet-gtk/contrib/open_directory_dialog.glade)
===================================================================
--- gnunet-gtk/contrib/gnunet_fs_gtk_open_directory_dialog.glade                
                (rev 0)
+++ gnunet-gtk/contrib/gnunet_fs_gtk_open_directory_dialog.glade        
2011-08-15 14:20:33 UTC (rev 16549)
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <requires lib="gtk+" version="2.20"/>
+  <!-- interface-naming-policy project-wide -->
+  <object class="GtkFileFilter" id="gnunet_directory_filter"/>
+  <object class="GtkFileChooserDialog" id="GNUNET_GTK_open_directory_dialog">
+    <property name="can_default">True</property>
+    <property name="border_width">5</property>
+    <property name="type_hint">normal</property>
+    <property name="has_separator">False</property>
+    <property name="filter">gnunet_directory_filter</property>
+    <property name="create_folders">False</property>
+    <child internal-child="vbox">
+      <object class="GtkVBox" id="dialog-vbox3">
+        <property name="visible">True</property>
+        <property name="spacing">2</property>
+        <child>
+          <placeholder/>
+        </child>
+        <child internal-child="action_area">
+          <object class="GtkHButtonBox" id="dialog-action_area4">
+            <property name="visible">True</property>
+            <property name="layout_style">end</property>
+            <child>
+              <object class="GtkButton" 
id="GNUNET_GTK_open_directory_dialog_cancel_button">
+                <property name="label">gtk-cancel</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_action_appearance">False</property>
+                <property name="use_stock">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" 
id="GNUNET_GTK_open_directory_dialog_ok_button">
+                <property name="label">gtk-ok</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_action_appearance">False</property>
+                <property name="use_stock">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="pack_type">end</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+    <action-widgets>
+      <action-widget 
response="0">GNUNET_GTK_open_directory_dialog_cancel_button</action-widget>
+      <action-widget 
response="-5">GNUNET_GTK_open_directory_dialog_ok_button</action-widget>
+    </action-widgets>
+  </object>
+</interface>

Copied: gnunet-gtk/contrib/gnunet_fs_gtk_open_url_dialog.glade (from rev 16478, 
gnunet-gtk/contrib/open_url_dialog.glade)
===================================================================
--- gnunet-gtk/contrib/gnunet_fs_gtk_open_url_dialog.glade                      
        (rev 0)
+++ gnunet-gtk/contrib/gnunet_fs_gtk_open_url_dialog.glade      2011-08-15 
14:20:33 UTC (rev 16549)
@@ -0,0 +1,153 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <requires lib="gtk+" version="2.20"/>
+  <!-- interface-naming-policy project-wide -->
+  <object class="GtkImage" id="execute_stock_image">
+    <property name="visible">True</property>
+    <property name="stock">gtk-execute</property>
+  </object>
+  <object class="GtkAdjustment" id="GNUNET_GTK_open_url_anonymity_adjustment">
+    <property name="upper">100000</property>
+    <property name="value">1</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
+  <object class="GtkDialog" id="GNUNET_GTK_open_url_dialog">
+    <property name="width_request">500</property>
+    <property name="height_request">100</property>
+    <property name="border_width">5</property>
+    <property name="title" translatable="yes">Download from URI</property>
+    <property name="modal">True</property>
+    <property name="destroy_with_parent">True</property>
+    <property name="icon_name">dialog-password</property>
+    <property name="type_hint">dialog</property>
+    <property name="skip_taskbar_hint">True</property>
+    <property name="skip_pager_hint">True</property>
+    <property name="has_separator">False</property>
+    <child internal-child="vbox">
+      <object class="GtkVBox" id="GNUNET_GTK_open_url_dialog_main_vbox">
+        <property name="visible">True</property>
+        <property name="spacing">2</property>
+        <child>
+          <object class="GtkHBox" id="GNUNET_GTK_open_url_dialog_query_hbox">
+            <property name="visible">True</property>
+            <child>
+              <object class="GtkLabel" 
id="GNUNET_GTK_open_url_dialog_url_label">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">_URI:</property>
+                <property name="use_underline">True</property>
+                <property name="selectable">True</property>
+                <property 
name="mnemonic_widget">GNUNET_GTK_open_url_dialog_url_entry</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkEntry" 
id="GNUNET_GTK_open_url_dialog_url_entry">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="invisible_char">●</property>
+                <property name="activates_default">True</property>
+                <property name="caps_lock_warning">False</property>
+                <property 
name="primary_icon_stock">gtk-dialog-authentication</property>
+                <property name="primary_icon_tooltip_text" 
translatable="yes">Separate multiple keywords with spaces, prefix mandatory 
keywords with "+"</property>
+                <signal name="changed" 
handler="GNUNET_GTK_open_url_dialog_url_entry_changed_cb" swapped="no"/>
+                <signal name="activate" 
handler="GNUNET_GTK_search_dialog_search_button_clicked_cb" swapped="no"/>
+              </object>
+              <packing>
+                <property name="position">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" 
id="GNUNET_GTK_open_url_dialog_anonymity_label">
+                <property name="visible">True</property>
+                <property name="label" 
translatable="yes">_Anonymity:</property>
+                <property name="use_underline">True</property>
+                <property name="selectable">True</property>
+                <property 
name="mnemonic_widget">GNUNET_GTK_open_url_dialog_anonymity_spin_button</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">2</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkSpinButton" 
id="GNUNET_GTK_open_url_dialog_anonymity_spin_button">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="invisible_char">●</property>
+                <property name="caps_lock_warning">False</property>
+                <property 
name="adjustment">GNUNET_GTK_open_url_anonymity_adjustment</property>
+                <property name="climb_rate">1</property>
+                <property name="numeric">True</property>
+                <signal name="value-changed" 
handler="GNUNET_GTK_anonymity_spin_button_value_changed_cb" swapped="no"/>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">3</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="padding">5</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child internal-child="action_area">
+          <object class="GtkHButtonBox" 
id="GNUNET_GTK_open_url_dialog_action_area">
+            <property name="visible">True</property>
+            <property name="layout_style">end</property>
+            <child>
+              <object class="GtkButton" 
id="GNUNET_GTK_open_url_dialog_cancel_button">
+                <property name="label">gtk-cancel</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_action_appearance">False</property>
+                <property name="use_stock">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" 
id="GNUNET_GTK_open_url_dialog_execute_button">
+                <property name="label">_Execute</property>
+                <property name="visible">True</property>
+                <property name="sensitive">False</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_action_appearance">False</property>
+                <property name="image">execute_stock_image</property>
+                <property name="use_underline">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="pack_type">end</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+    <action-widgets>
+      <action-widget 
response="-6">GNUNET_GTK_open_url_dialog_cancel_button</action-widget>
+      <action-widget 
response="-5">GNUNET_GTK_open_url_dialog_execute_button</action-widget>
+    </action-widgets>
+  </object>
+</interface>

Copied: gnunet-gtk/contrib/gnunet_fs_gtk_publish_dialog.glade (from rev 16478, 
gnunet-gtk/contrib/publish_dialog.glade)
===================================================================
--- gnunet-gtk/contrib/gnunet_fs_gtk_publish_dialog.glade                       
        (rev 0)
+++ gnunet-gtk/contrib/gnunet_fs_gtk_publish_dialog.glade       2011-08-15 
14:20:33 UTC (rev 16549)
@@ -0,0 +1,499 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <requires lib="gtk+" version="2.20"/>
+  <!-- interface-naming-policy project-wide -->
+  <object class="GtkAdjustment" id="adjustment4">
+    <property name="upper">100</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+    <property name="page_size">10</property>
+  </object>
+  <object class="GtkAdjustment" id="adjustment3">
+    <property name="upper">100</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+    <property name="page_size">10</property>
+  </object>
+  <object class="GtkAdjustment" id="adjustment2">
+    <property name="upper">100</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+    <property name="page_size">10</property>
+  </object>
+  <object class="GtkAdjustment" id="adjustment1">
+    <property name="upper">100</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+    <property name="page_size">10</property>
+  </object>
+  <object class="GtkImage" id="right_stock_image">
+    <property name="visible">True</property>
+    <property name="stock">gtk-go-forward</property>
+  </object>
+  <object class="GtkImage" id="left_stock_image">
+    <property name="visible">True</property>
+    <property name="stock">gtk-go-back</property>
+  </object>
+  <object class="GtkImage" id="add_stock_image_2">
+    <property name="visible">True</property>
+    <property name="stock">gtk-add</property>
+  </object>
+  <object class="GtkImage" id="new_stock_image">
+    <property name="visible">True</property>
+    <property name="stock">gtk-new</property>
+  </object>
+  <object class="GtkImage" id="add_stock_image">
+    <property name="visible">True</property>
+    <property name="stock">gtk-add</property>
+  </object>
+  <object class="GtkTreeStore" 
id="GNUNET_GTK_file_sharing_publishing_tree_store">
+    <columns>
+      <!-- column-name filesize -->
+      <column type="gchararray"/>
+      <!-- column-name do_index -->
+      <column type="gboolean"/>
+      <!-- column-name filename -->
+      <column type="gchararray"/>
+      <!-- column-name anonymity_level -->
+      <column type="guint"/>
+      <!-- column-name priority -->
+      <column type="guint"/>
+      <!-- column-name file_information_struct -->
+      <column type="gpointer"/>
+    </columns>
+  </object>
+  <object class="GtkDialog" id="GNUNET_GTK_master_publish_dialog">
+    <property name="height_request">500</property>
+    <property name="border_width">5</property>
+    <property name="title" translatable="yes">Publish content on 
GNUnet</property>
+    <property name="modal">True</property>
+    <property name="window_position">center-on-parent</property>
+    <property name="type_hint">dialog</property>
+    <property name="skip_taskbar_hint">True</property>
+    <property name="has_separator">False</property>
+    <child internal-child="vbox">
+      <object class="GtkVBox" id="GNUNET_GTK_master_publish_dialog_vbox">
+        <property name="visible">True</property>
+        <property name="spacing">2</property>
+        <child>
+          <object class="GtkVBox" 
id="GNUNET_GTK_master_publish_dialog_file_information_vbox">
+            <property name="visible">True</property>
+            <child>
+              <object class="GtkScrolledWindow" 
id="GNUNET_GTK_master_publish_dialog_file_information_scrolled_window">
+                <property name="height_request">100</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="hadjustment">adjustment1</property>
+                <property name="vadjustment">adjustment2</property>
+                <property name="hscrollbar_policy">automatic</property>
+                <property name="vscrollbar_policy">automatic</property>
+                <child>
+                  <object class="GtkTreeView" 
id="GNUNET_GTK_master_publish_dialog_file_information_tree_view">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property 
name="model">GNUNET_GTK_file_sharing_publishing_tree_store</property>
+                    <property name="hadjustment">adjustment1</property>
+                    <property name="vadjustment">adjustment2</property>
+                    <property name="enable_tree_lines">True</property>
+                    <child>
+                      <object class="GtkTreeViewColumn" 
id="GNUNET_GTK_master_publish_dialog_file_information_filesize_column">
+                        <property name="sizing">autosize</property>
+                        <property name="title" 
translatable="yes">Size</property>
+                        <child>
+                          <object class="GtkCellRendererText" 
id="GNUNET_GTK_master_publish_dialog_file_information_filesize_renderer"/>
+                          <attributes>
+                            <attribute name="text">0</attribute>
+                          </attributes>
+                        </child>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkTreeViewColumn" 
id="GNUNET_GTK_master_publish_dialog_file_information_filename_column">
+                        <property name="resizable">True</property>
+                        <property name="sizing">autosize</property>
+                        <property name="title" 
translatable="yes">Filename</property>
+                        <property name="expand">True</property>
+                        <property name="clickable">True</property>
+                        <property name="reorderable">True</property>
+                        <property name="sort_indicator">True</property>
+                        <child>
+                          <object class="GtkCellRendererText" 
id="GNUNET_GTK_master_publish_dialog_file_information_filename_renderer"/>
+                          <attributes>
+                            <attribute name="text">2</attribute>
+                          </attributes>
+                        </child>
+                      </object>
+                    </child>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
+            <property name="padding">8</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkHBox" 
id="GNUNET_GTK_master_dialog_modification_button_hbox">
+            <property name="visible">True</property>
+            <child>
+              <object class="GtkTable" 
id="GNUNET_GTK_master_publish_dialog_action_table">
+                <property name="visible">True</property>
+                <property name="n_rows">2</property>
+                <property name="n_columns">3</property>
+                <child>
+                  <object class="GtkButton" 
id="GNUNET_GTK_master_publish_dialog_add_button">
+                    <property name="label">Add _File</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">True</property>
+                    <property name="use_action_appearance">False</property>
+                    <property name="image">add_stock_image</property>
+                    <property name="use_underline">True</property>
+                    <signal name="clicked" 
handler="GNUNET_GTK_master_publish_dialog_add_button_clicked_cb" swapped="no"/>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkButton" 
id="GNUNET_GTK_master_publish_dialog_open_button">
+                    <property name="label">Add _Directory</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">True</property>
+                    <property name="use_action_appearance">False</property>
+                    <property name="image">add_stock_image_2</property>
+                    <property name="use_underline">True</property>
+                    <signal name="clicked" 
handler="GNUNET_GTK_master_publish_dialog_open_button_clicked_cb" swapped="no"/>
+                  </object>
+                  <packing>
+                    <property name="top_attach">1</property>
+                    <property name="bottom_attach">2</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkButton" 
id="GNUNET_GTK_master_publish_dialog_delete_button">
+                    <property name="label">gtk-delete</property>
+                    <property name="visible">True</property>
+                    <property name="sensitive">False</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">True</property>
+                    <property name="use_action_appearance">False</property>
+                    <property name="use_stock">True</property>
+                    <signal name="clicked" 
handler="GNUNET_GTK_master_publish_dialog_delete_button_clicked_cb" 
swapped="no"/>
+                  </object>
+                  <packing>
+                    <property name="left_attach">2</property>
+                    <property name="right_attach">3</property>
+                    <property name="top_attach">1</property>
+                    <property name="bottom_attach">2</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkButton" 
id="GNUNET_GTK_master_publish_dialog_edit_button">
+                    <property name="label">gtk-edit</property>
+                    <property name="visible">True</property>
+                    <property name="sensitive">False</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">True</property>
+                    <property name="use_action_appearance">False</property>
+                    <property name="use_stock">True</property>
+                    <signal name="clicked" 
handler="GNUNET_GTK_master_publish_dialog_edit_button_clicked_cb" swapped="no"/>
+                  </object>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="right_attach">2</property>
+                    <property name="top_attach">1</property>
+                    <property name="bottom_attach">2</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkButton" 
id="GNUNET_GTK_master_publish_dialog_new_button">
+                    <property name="label">_Create empty directory</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">True</property>
+                    <property name="use_action_appearance">False</property>
+                    <property name="image">new_stock_image</property>
+                    <property name="use_underline">True</property>
+                    <signal name="clicked" 
handler="GNUNET_GTK_master_publish_dialog_new_button_clicked_cb" swapped="no"/>
+                  </object>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="right_attach">3</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="padding">25</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkTable" 
id="GNUNET_GTK_master_publish_dialog_arrow_table">
+                <property name="visible">True</property>
+                <property name="n_rows">2</property>
+                <property name="n_columns">3</property>
+                <property name="homogeneous">True</property>
+                <child>
+                  <object class="GtkButton" 
id="GNUNET_GTK_master_publish_dialog_up_button">
+                    <property name="label">gtk-go-up</property>
+                    <property name="visible">True</property>
+                    <property name="sensitive">False</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">True</property>
+                    <property name="use_action_appearance">False</property>
+                    <property name="use_stock">True</property>
+                    <signal name="clicked" 
handler="GNUNET_GTK_master_publish_dialog_up_button_clicked_cb" swapped="no"/>
+                  </object>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="right_attach">2</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkButton" 
id="GNUNET_GTK_master_publish_dialog_down_button">
+                    <property name="label">gtk-go-down</property>
+                    <property name="visible">True</property>
+                    <property name="sensitive">False</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">True</property>
+                    <property name="use_action_appearance">False</property>
+                    <property name="use_stock">True</property>
+                    <signal name="clicked" 
handler="GNUNET_GTK_master_publish_dialog_down_button_clicked_cb" swapped="no"/>
+                  </object>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="right_attach">2</property>
+                    <property name="top_attach">1</property>
+                    <property name="bottom_attach">2</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkButton" 
id="GNUNET_GTK_master_publish_dialog_left_button">
+                    <property name="label">_Left</property>
+                    <property name="visible">True</property>
+                    <property name="sensitive">False</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">True</property>
+                    <property name="use_action_appearance">False</property>
+                    <property name="image">left_stock_image</property>
+                    <property name="use_underline">True</property>
+                    <signal name="clicked" 
handler="GNUNET_GTK_master_publish_dialog_left_button_clicked_cb" swapped="no"/>
+                  </object>
+                  <packing>
+                    <property name="top_attach">1</property>
+                    <property name="bottom_attach">2</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkButton" 
id="GNUNET_GTK_master_publish_dialog_right_button">
+                    <property name="label">_Right</property>
+                    <property name="visible">True</property>
+                    <property name="sensitive">False</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">True</property>
+                    <property name="use_action_appearance">False</property>
+                    <property name="image">right_stock_image</property>
+                    <property name="use_underline">True</property>
+                    <signal name="clicked" 
handler="GNUNET_GTK_master_publish_dialog_right_button_clicked_cb" 
swapped="no"/>
+                  </object>
+                  <packing>
+                    <property name="left_attach">2</property>
+                    <property name="right_attach">3</property>
+                    <property name="top_attach">1</property>
+                    <property name="bottom_attach">2</property>
+                  </packing>
+                </child>
+                <child>
+                  <placeholder/>
+                </child>
+                <child>
+                  <placeholder/>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="padding">25</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkScrolledWindow" 
id="GNUNET_GTK_master_publish_dialog_pseudonym_scrolled_window">
+            <property name="height_request">100</property>
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="hadjustment">adjustment3</property>
+            <property name="vadjustment">adjustment4</property>
+            <property name="hscrollbar_policy">automatic</property>
+            <property name="vscrollbar_policy">automatic</property>
+            <child>
+              <object class="GtkTreeView" 
id="GNUNET_GTK_master_publish_dialog_pseudonym_tree_view">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property 
name="model">GNUNET_GTK_pseudonym_tree_store</property>
+                <property name="hadjustment">adjustment3</property>
+                <property name="vadjustment">adjustment4</property>
+                <property name="reorderable">True</property>
+                <property name="rubber_banding">True</property>
+                <property name="enable_grid_lines">both</property>
+                <child>
+                  <object class="GtkTreeViewColumn" 
id="GNUNET_GTK_master_publish_dialog_pseudonym_name_column">
+                    <property name="resizable">True</property>
+                    <property name="title" 
translatable="yes">Pseudonym</property>
+                    <property name="clickable">True</property>
+                    <property name="reorderable">True</property>
+                    <property name="sort_indicator">True</property>
+                    <child>
+                      <object class="GtkCellRendererText" 
id="GNUNET_GTK_master_publish_dialog_pseudonym_name_renderer"/>
+                      <attributes>
+                        <attribute name="text">0</attribute>
+                      </attributes>
+                    </child>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkTreeViewColumn" 
id="GNUNET_GTK_master_publish_dialog_pseudonym_identifier_column">
+                    <property name="resizable">True</property>
+                    <property name="sizing">autosize</property>
+                    <property name="title" translatable="yes">Current 
identifier</property>
+                    <property name="clickable">True</property>
+                    <child>
+                      <object class="GtkCellRendererText" 
id="GNUNET_GTK_master_publish_dialog_pseudonym_identifier_renderer">
+                        <signal name="edited" 
handler="GNUNET_GTK_master_publish_dialog_pseudonym_identifier_renderer_edited_cb"
 swapped="no"/>
+                      </object>
+                      <attributes>
+                        <attribute name="editable">8</attribute>
+                        <attribute name="text">2</attribute>
+                      </attributes>
+                    </child>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkTreeViewColumn" 
id="GNUNET_GTK_master_publish_dialog_pseudonym_updates_column">
+                    <property name="resizable">True</property>
+                    <property name="sizing">autosize</property>
+                    <property name="fixed_width">5</property>
+                    <property name="title" translatable="yes">Update 
identifier</property>
+                    <child>
+                      <object class="GtkCellRendererText" 
id="GNUNET_GTK_master_publish_dialog_pseudonym_updates_renderer">
+                        <signal name="edited" 
handler="GNUNET_GTK_master_publish_dialog_pseudonym_updates_renderer_edited_cb" 
swapped="no"/>
+                      </object>
+                      <attributes>
+                        <attribute name="editable">7</attribute>
+                        <attribute name="text">5</attribute>
+                      </attributes>
+                    </child>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkTreeViewColumn" 
id="GNUNET_GTK_master_publish_dialog_pseudonym_description_column">
+                    <property name="title" translatable="yes">Description (of 
existing content)</property>
+                    <child>
+                      <object class="GtkCellRendererText" 
id="GNUNET_GTK_master_publish_dialog_pseudonym_description_renderer">
+                        <property name="wrap_mode">word</property>
+                      </object>
+                      <attributes>
+                        <attribute name="text">6</attribute>
+                      </attributes>
+                    </child>
+                  </object>
+                </child>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">2</property>
+          </packing>
+        </child>
+        <child internal-child="action_area">
+          <object class="GtkHButtonBox" 
id="GNUNET_GTK_master_publish_dialog_master_action_area">
+            <property name="visible">True</property>
+            <property name="layout_style">end</property>
+            <child>
+              <object class="GtkButton" 
id="GNUNET_GTK_master_publish_dialog_cancel_button">
+                <property name="label">gtk-cancel</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_action_appearance">False</property>
+                <property name="use_stock">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" 
id="GNUNET_GTK_master_publish_dialog_execute_button">
+                <property name="label">gtk-execute</property>
+                <property name="visible">True</property>
+                <property name="sensitive">False</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_action_appearance">False</property>
+                <property name="use_stock">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="pack_type">end</property>
+            <property name="position">3</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+    <action-widgets>
+      <action-widget 
response="-6">GNUNET_GTK_master_publish_dialog_cancel_button</action-widget>
+      <action-widget 
response="-5">GNUNET_GTK_master_publish_dialog_execute_button</action-widget>
+    </action-widgets>
+  </object>
+  <object class="GtkTreeStore" id="GNUNET_GTK_pseudonym_tree_store">
+    <columns>
+      <!-- column-name local_name -->
+      <column type="gchararray"/>
+      <!-- column-name namespace_handle -->
+      <column type="gpointer"/>
+      <!-- column-name last_id -->
+      <column type="gchararray"/>
+      <!-- column-name last_uri -->
+      <column type="gchararray"/>
+      <!-- column-name last_meta -->
+      <column type="gpointer"/>
+      <!-- column-name next_id -->
+      <column type="gchararray"/>
+      <!-- column-name last_description_from_meta -->
+      <column type="gchararray"/>
+      <!-- column-name next_id_editable -->
+      <column type="gboolean"/>
+      <!-- column-name current_id_editable -->
+      <column type="gboolean"/>
+    </columns>
+  </object>
+</interface>

Copied: gnunet-gtk/contrib/gnunet_fs_gtk_publish_directory_dialog.glade (from 
rev 16478, gnunet-gtk/contrib/publish-directory-dialog.glade)
===================================================================
--- gnunet-gtk/contrib/gnunet_fs_gtk_publish_directory_dialog.glade             
                (rev 0)
+++ gnunet-gtk/contrib/gnunet_fs_gtk_publish_directory_dialog.glade     
2011-08-15 14:20:33 UTC (rev 16549)
@@ -0,0 +1,215 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <requires lib="gtk+" version="2.20"/>
+  <!-- interface-naming-policy project-wide -->
+  <object class="GtkAdjustment" id="expiration_year_adjustment">
+    <property name="upper">9999</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
+  <object class="GtkAdjustment" id="priority_adjustment">
+    <property name="upper">100000000</property>
+    <property name="value">1000</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
+  <object class="GtkListStore" 
id="GNUNET_GTK_publish_directory_dialog_expiration_list_store">
+    <columns>
+      <!-- column-name human_readable_time -->
+      <column type="gchararray"/>
+      <!-- column-name time_in_ms -->
+      <column type="guint64"/>
+    </columns>
+  </object>
+  <object class="GtkFileChooserDialog" 
id="GNUNET_GTK_publish_directory_dialog">
+    <property name="can_default">True</property>
+    <property name="border_width">5</property>
+    <property name="type_hint">normal</property>
+    <property name="has_separator">False</property>
+    <property name="action">select-folder</property>
+    <property name="select_multiple">True</property>
+    <property name="create_folders">False</property>
+    <child internal-child="vbox">
+      <object class="GtkVBox" id="dialog-vbox2">
+        <property name="visible">True</property>
+        <property name="spacing">2</property>
+        <child>
+          <object class="GtkVBox" id="vbox1">
+            <property name="visible">True</property>
+            <child>
+              <object class="GtkHBox" id="hbox1">
+                <property name="visible">True</property>
+                <child>
+                  <object class="GtkCheckButton" 
id="GNUNET_GTK_publish_directory_dialog_do_index_checkbutton">
+                    <property name="label" translatable="yes">Index 
files</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
+                    <property name="use_action_appearance">False</property>
+                    <property name="use_underline">True</property>
+                    <property name="active">True</property>
+                    <property name="draw_indicator">True</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="padding">20</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <placeholder/>
+                </child>
+                <child>
+                  <object class="GtkLabel" 
id="GNUNET_GTK_publish_directory_dialog_priority_label">
+                    <property name="visible">True</property>
+                    <property name="label" 
translatable="yes">Priority:</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="padding">13</property>
+                    <property name="position">2</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkSpinButton" 
id="GNUNET_GTK_publish_directory_dialog_priority_spin_button">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="invisible_char">•</property>
+                    <property name="adjustment">priority_adjustment</property>
+                    <property name="numeric">True</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="padding">20</property>
+                    <property name="position">3</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkHBox" id="hbox2">
+                <property name="visible">True</property>
+                <child>
+                  <object class="GtkLabel" 
id="GNUNET_GTK_publish_directory_dialog_expiration_label">
+                    <property name="visible">True</property>
+                    <property name="label" translatable="yes">Expiration 
year:</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="padding">20</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkSpinButton" 
id="GNUNET_GTK_publish_directory_dialog_expiration_year_spin_button">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="invisible_char">•</property>
+                    <property 
name="adjustment">expiration_year_adjustment</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" 
id="GNUNET_GTK_publish_directory_dialog_anonymity_label">
+                    <property name="visible">True</property>
+                    <property name="label" 
translatable="yes">Anonymity:</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="padding">5</property>
+                    <property name="position">2</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkSpinButton" 
id="GNUNET_GTK_publish_directory_dialog_anonymity_spin_button">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="invisible_char">•</property>
+                    <property name="adjustment">anonymity_adjustment</property>
+                    <property name="numeric">True</property>
+                    <signal name="value-changed" 
handler="GNUNET_GTK_anonymity_spin_button_value_changed_cb" swapped="no"/>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="padding">20</property>
+                    <property name="position">3</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="position">2</property>
+          </packing>
+        </child>
+        <child internal-child="action_area">
+          <object class="GtkHButtonBox" id="dialog-action_area3">
+            <property name="visible">True</property>
+            <property name="layout_style">end</property>
+            <child>
+              <object class="GtkButton" 
id="GNUNET_GTK_publish_dialog_cancel_button">
+                <property name="label">gtk-cancel</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_action_appearance">False</property>
+                <property name="use_stock">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" 
id="GNUNET_GTK_publish_directory_dialog_ok_button">
+                <property name="label">gtk-ok</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_action_appearance">False</property>
+                <property name="use_stock">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="pack_type">end</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+    <action-widgets>
+      <action-widget 
response="-6">GNUNET_GTK_publish_dialog_cancel_button</action-widget>
+      <action-widget 
response="-5">GNUNET_GTK_publish_directory_dialog_ok_button</action-widget>
+    </action-widgets>
+  </object>
+  <object class="GtkAdjustment" id="anonymity_adjustment">
+    <property name="upper">10000000</property>
+    <property name="value">1</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
+</interface>

Copied: gnunet-gtk/contrib/gnunet_fs_gtk_publish_edit_dialog.glade (from rev 
16478, gnunet-gtk/contrib/publish_edit_dialog.glade)
===================================================================
--- gnunet-gtk/contrib/gnunet_fs_gtk_publish_edit_dialog.glade                  
        (rev 0)
+++ gnunet-gtk/contrib/gnunet_fs_gtk_publish_edit_dialog.glade  2011-08-15 
14:20:33 UTC (rev 16549)
@@ -0,0 +1,717 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <requires lib="gtk+" version="2.20"/>
+  <!-- interface-naming-policy project-wide -->
+  <object class="GtkAdjustment" id="adjustment2">
+    <property name="upper">100</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+    <property name="page_size">10</property>
+  </object>
+  <object class="GtkAdjustment" id="adjustment1">
+    <property name="upper">100</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+    <property name="page_size">10</property>
+  </object>
+  <object class="GtkListStore" id="GNUNET_GTK_metatype_list_store">
+    <columns>
+      <!-- column-name description -->
+      <column type="gchararray"/>
+      <!-- column-name guint1 -->
+      <column type="guint"/>
+      <!-- column-name helptext -->
+      <column type="gchararray"/>
+    </columns>
+  </object>
+  <object class="GtkListStore" id="GNUNET_GTK_meta_data_list_store">
+    <columns>
+      <!-- column-name extractor_meta_type -->
+      <column type="guint"/>
+      <!-- column-name extractor_meta_format -->
+      <column type="guint"/>
+      <!-- column-name extractor_meta_type_string -->
+      <column type="gchararray"/>
+      <!-- column-name extracotr_meta_value -->
+      <column type="gchararray"/>
+    </columns>
+  </object>
+  <object class="GtkDialog" id="GNUNET_GTK_edit_file_information_dialog">
+    <property name="border_width">5</property>
+    <property name="destroy_with_parent">True</property>
+    <property name="type_hint">dialog</property>
+    <property name="skip_taskbar_hint">True</property>
+    <property name="has_separator">False</property>
+    <child internal-child="vbox">
+      <object class="GtkVBox" 
id="GNUNET_GTK_edit_file_information_master_vbox">
+        <property name="visible">True</property>
+        <property name="spacing">2</property>
+        <child>
+          <object class="GtkHBox" 
id="GNUNET_GTK_edit_file_information_metadata_hbox">
+            <property name="visible">True</property>
+            <child>
+              <object class="GtkVBox" 
id="GNUNET_GTK_edit_file_information_metadata_vbox">
+                <property name="visible">True</property>
+                <property name="spacing">5</property>
+                <child>
+                  <object class="GtkHBox" 
id="GNUNET_GTK_edit_file_information_metadata_edit_hbox">
+                    <property name="visible">True</property>
+                    <child>
+                      <object class="GtkLabel" 
id="GNUNET_GTK_edit_file_information_metadata_type_label">
+                        <property name="visible">True</property>
+                        <property name="label" 
translatable="yes">Type:</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkScrolledWindow" 
id="GNUNET_GTK_edit_file_information_metadata_type_scrolled_window">
+                        <property name="height_request">100</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="hscrollbar_policy">never</property>
+                        <property name="vscrollbar_policy">automatic</property>
+                        <child>
+                          <object class="GtkTreeView" 
id="GNUNET_GTK_edit_file_information_metadata_type_tree_view">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property 
name="model">GNUNET_GTK_metatype_list_store</property>
+                            <property name="headers_visible">False</property>
+                            <property name="headers_clickable">False</property>
+                            <property name="reorderable">True</property>
+                            <property name="enable_search">False</property>
+                            <property name="tooltip_column">2</property>
+                            <child>
+                              <object class="GtkTreeViewColumn" 
id="GNUNET_GTK_edit_file_information_metadata_type_tree_view_column">
+                                <property name="title" 
translatable="yes">Value</property>
+                                <property name="sort_column_id">0</property>
+                                <child>
+                                  <object class="GtkCellRendererText" 
id="GNUNET_GTK_edit_file_information_metadata_type_tree_view_renderer"/>
+                                  <attributes>
+                                    <attribute name="text">0</attribute>
+                                  </attributes>
+                                </child>
+                              </object>
+                            </child>
+                          </object>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkLabel" 
id="GNUNET_GTK_edit_file_information_metadata_value_label">
+                        <property name="visible">True</property>
+                        <property name="label" 
translatable="yes">Value:</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="padding">5</property>
+                        <property name="position">2</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkEntry" 
id="GNUNET_GTK_edit_file_information_metadata_value_entry">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="invisible_char">●</property>
+                        <signal name="changed" 
handler="GNUNET_GTK_edit_file_information_metadata_value_entry_changed_cb" 
swapped="no"/>
+                      </object>
+                      <packing>
+                        <property name="position">3</property>
+                      </packing>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkScrolledWindow" 
id="GNUNET_GTK_edit_file_information_metadata_scrolled_window">
+                    <property name="width_request">400</property>
+                    <property name="height_request">120</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="hadjustment">adjustment1</property>
+                    <property name="vadjustment">adjustment2</property>
+                    <property name="hscrollbar_policy">automatic</property>
+                    <property name="vscrollbar_policy">automatic</property>
+                    <child>
+                      <object class="GtkTreeView" 
id="GNUNET_GTK_edit_file_information_metadata_tree_view">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property 
name="model">GNUNET_GTK_meta_data_list_store</property>
+                        <property name="hadjustment">adjustment1</property>
+                        <property name="vadjustment">adjustment2</property>
+                        <property name="enable_search">False</property>
+                        <child>
+                          <object class="GtkTreeViewColumn" 
id="GNUNET_GTK_edit_file_information_metadata_tree_view_type_column">
+                            <property name="sizing">fixed</property>
+                            <property name="fixed_width">120</property>
+                            <property name="title" 
translatable="yes">Type</property>
+                            <property name="reorderable">True</property>
+                            <property name="sort_column_id">2</property>
+                            <child>
+                              <object class="GtkCellRendererText" 
id="GNUNET_GTK_edit_file_information_metadata_tree_view_type_renderer"/>
+                              <attributes>
+                                <attribute name="text">2</attribute>
+                              </attributes>
+                            </child>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkTreeViewColumn" 
id="GNUNET_GTK_edit_file_information_metadata_tree_view_description_column">
+                            <property name="title" 
translatable="yes">Value</property>
+                            <property name="expand">True</property>
+                            <property name="reorderable">True</property>
+                            <property name="sort_column_id">3</property>
+                            <child>
+                              <object class="GtkCellRendererText" 
id="GNUNET_GTK_edit_file_information_metadata_tree_view_value_renderer"/>
+                              <attributes>
+                                <attribute name="text">3</attribute>
+                              </attributes>
+                            </child>
+                          </object>
+                        </child>
+                      </object>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkVBox" 
id="GNUNET_GTK_edit_file_information_metadata_button_vbox">
+                <property name="visible">True</property>
+                <child>
+                  <object class="GtkButton" 
id="GNUNET_GTK_edit_file_information_metadata_add_button">
+                    <property name="label">gtk-add</property>
+                    <property name="visible">True</property>
+                    <property name="sensitive">False</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">True</property>
+                    <property name="use_action_appearance">False</property>
+                    <property name="use_stock">True</property>
+                    <signal name="clicked" 
handler="GNUNET_GTK_edit_file_information_metadata_add_button_clicked_cb" 
swapped="no"/>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkButton" 
id="GNUNET_GTK_edit_file_information_metadata_delete_button">
+                    <property name="label">gtk-delete</property>
+                    <property name="visible">True</property>
+                    <property name="sensitive">False</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">True</property>
+                    <property name="use_action_appearance">False</property>
+                    <property name="use_stock">True</property>
+                    <signal name="clicked" 
handler="GNUNET_GTK_edit_file_information_metadata_delete_button_clicked_cb" 
swapped="no"/>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="padding">5</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" 
id="GNUNET_GTK_edit_file_information_metadata_preview_label">
+                    <property name="visible">True</property>
+                    <property name="label" 
translatable="yes">Preview:</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="padding">10</property>
+                    <property name="position">2</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkImage" 
id="GNUNET_GTK_edit_file_information_metadata_preview_image">
+                    <property name="visible">True</property>
+                    <property name="sensitive">False</property>
+                    <property name="stock">gtk-missing-image</property>
+                  </object>
+                  <packing>
+                    <property name="position">3</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkFileChooserButton" 
id="GNUNET_GTK_edit_file_information_metadata_preview_file_chooser_button">
+                    <property name="visible">True</property>
+                    <property name="create_folders">False</property>
+                    <property name="title" translatable="yes">Select 
file</property>
+                    <signal name="file-set" 
handler="GNUNET_GTK_edit_file_information_metadata_preview_file_chooser_button_file_set_cb"
 swapped="no"/>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">4</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="padding">5</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkHBox" 
id="GNUNET_GTK_edit_file_information_secondary_hbox">
+            <property name="visible">True</property>
+            <child>
+              <object class="GtkVBox" 
id="GNUNET_GTK_edit_file_information_keyword_entry_vbox">
+                <property name="visible">True</property>
+                <child>
+                  <object class="GtkHBox" 
id="GNUNET_GTK_edit_file_information_keyword_hbox">
+                    <property name="visible">True</property>
+                    <child>
+                      <object class="GtkLabel" 
id="GNUNET_GTK_edit_file_information_keyword_label">
+                        <property name="visible">True</property>
+                        <property name="label" 
translatable="yes">_Keyword:</property>
+                        <property name="use_underline">True</property>
+                        <property 
name="mnemonic_widget">GNUNET_GTK_edit_file_information_keyword_entry</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkEntry" 
id="GNUNET_GTK_edit_file_information_keyword_entry">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="invisible_char">●</property>
+                        <property name="caps_lock_warning">False</property>
+                        <signal name="changed" 
handler="GNUNET_GTK_edit_file_information_keyword_entry_changed_cb" 
swapped="no"/>
+                        <signal name="activate" 
handler="GNUNET_GTK_edit_file_information_keyword_entry_activate_cb" 
swapped="no"/>
+                      </object>
+                      <packing>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="padding">5</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkHBox" 
id="GNUNET_GTK_edit_file_information_keyword_list_hbox">
+                    <property name="visible">True</property>
+                    <child>
+                      <object class="GtkScrolledWindow" 
id="GNUNET_GTK_edit_file_information_keyword_scrolled_window">
+                        <property name="width_request">400</property>
+                        <property name="height_request">120</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="hscrollbar_policy">never</property>
+                        <property name="vscrollbar_policy">automatic</property>
+                        <child>
+                          <object class="GtkTreeView" 
id="GNUNET_GTK_edit_file_information_keyword_list_tree_view">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property 
name="model">GNUNET_GTK_keyword_list_store</property>
+                            <property name="search_column">0</property>
+                            <child>
+                              <object class="GtkTreeViewColumn" 
id="GNUNET_GTK_edit_file_information_keyword_list_tree_view_column">
+                                <property name="title" 
translatable="yes">Keywords</property>
+                                <property name="reorderable">True</property>
+                                <property name="sort_column_id">0</property>
+                                <child>
+                                  <object class="GtkCellRendererText" 
id="GNUNET_GTK_edit_file_information_keyword_list_tree_view_renderer"/>
+                                  <attributes>
+                                    <attribute name="text">0</attribute>
+                                  </attributes>
+                                </child>
+                              </object>
+                            </child>
+                          </object>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkVBox" 
id="GNUNET_GTK_edit_file_information_keyword_list_button_vbox">
+                        <property name="visible">True</property>
+                        <child>
+                          <object class="GtkButton" 
id="GNUNET_GTK_edit_file_information_keyword_list_add_button">
+                            <property name="label">gtk-add</property>
+                            <property name="visible">True</property>
+                            <property name="sensitive">False</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">True</property>
+                            <property 
name="use_action_appearance">False</property>
+                            <property name="use_stock">True</property>
+                            <signal name="clicked" 
handler="GNUNET_GTK_edit_file_information_keyword_list_add_button_clicked_cb" 
swapped="no"/>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkButton" 
id="GNUNET_GTK_edit_file_information_keyword_list_del_button">
+                            <property name="label">gtk-delete</property>
+                            <property name="visible">True</property>
+                            <property name="sensitive">False</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">True</property>
+                            <property 
name="use_action_appearance">False</property>
+                            <property name="use_stock">True</property>
+                            <signal name="clicked" 
handler="GNUNET_GTK_edit_file_information_keyword_list_del_button_clicked_cb" 
swapped="no"/>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="padding">5</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkButton" 
id="GNUNET_GTK_edit_file_information_keyword_list_normalize_button">
+                            <property name="label" 
translatable="yes">_Normalize</property>
+                            <property name="sensitive">False</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">True</property>
+                            <property 
name="use_action_appearance">False</property>
+                            <property name="use_underline">True</property>
+                            <signal name="clicked" 
handler="GNUNET_GTK_edit_file_information_keyword_list_normalize_button_clicked_cb"
 swapped="no"/>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">2</property>
+                          </packing>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="padding">5</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="padding">5</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkVBox" 
id="GNUNET_GTK_edit_file_information_misc_vbox">
+                <property name="visible">True</property>
+                <child>
+                  <object class="GtkLabel" 
id="GNUNET_GTK_edit_file_information_options_label">
+                    <property name="visible">True</property>
+                    <property name="label" 
translatable="yes">Options</property>
+                    <property name="justify">center</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="padding">5</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkHSeparator" id="hseparator3">
+                    <property name="visible">True</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkHBox" 
id="GNUNET_GTK_edit_file_information_anonymity_hbox">
+                    <property name="visible">True</property>
+                    <child>
+                      <object class="GtkLabel" 
id="GNUNET_GTK_edit_file_information_anonymity_label">
+                        <property name="visible">True</property>
+                        <property name="label" 
translatable="yes">_Anonymity:</property>
+                        <property name="use_underline">True</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="padding">5</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkSpinButton" 
id="GNUNET_GTK_edit_file_information_anonymity_spin_button">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="tooltip_markup">Anonymity of zero 
means no anonymity.  Values larger than one require GNUnet to have cover 
traffic (with larger values implying more cover traffic).</property>
+                        <property name="invisible_char">●</property>
+                        <property 
name="adjustment">GNUNET_GTK_anonymity_adjustment</property>
+                        <signal name="value-changed" 
handler="GNUNET_GTK_anonymity_spin_button_value_changed_cb" after="yes" 
swapped="no"/>
+                      </object>
+                      <packing>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">2</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkHSeparator" id="hseparator1">
+                    <property name="visible">True</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">3</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkHBox" 
id="GNUNET_GTK_edit_file_information_priority_hbox">
+                    <property name="visible">True</property>
+                    <child>
+                      <object class="GtkLabel" 
id="GNUNET_GTK_edit_file_information_priority_label">
+                        <property name="visible">True</property>
+                        <property name="label" 
translatable="yes">_Priority:</property>
+                        <property name="use_underline">True</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="padding">5</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkSpinButton" 
id="GNUNET_GTK_edit_file_information_priority_spin_button">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="tooltip_markup">The content priority 
determines when content is discarded in favour of other, more popular content.  
</property>
+                        <property name="invisible_char">●</property>
+                        <property 
name="adjustment">priority_adjustment</property>
+                        <property name="numeric">True</property>
+                      </object>
+                      <packing>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">4</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkHSeparator" id="hseparator2">
+                    <property name="visible">True</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">5</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkHBox" 
id="GNUNET_GTK_edit_file_information_insert_hbox">
+                    <property name="visible">True</property>
+                    <child>
+                      <object class="GtkLabel" 
id="GNUNET_GTK_edit_file_information_index_label">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">_Index 
file</property>
+                        <property name="use_underline">True</property>
+                        <property 
name="mnemonic_widget">GNUNET_GTK_edit_file_information_index_check_button</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="padding">5</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkCheckButton" 
id="GNUNET_GTK_edit_file_information_index_check_button">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">False</property>
+                        <property name="tooltip_markup">Indexing saves space 
in the database but requires the file to remain unchanged in its original 
location afterwards.</property>
+                        <property name="use_action_appearance">False</property>
+                        <property name="draw_indicator">True</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">6</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkHSeparator" id="hseparator4">
+                    <property name="visible">True</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="position">7</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkHBox" id="hbox2">
+                    <property name="visible">True</property>
+                    <child>
+                      <object class="GtkLabel" 
id="GNUNET_GTK_edit_file_information_expiration_label">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">_Expriation 
year:</property>
+                        <property name="use_underline">True</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="padding">5</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkSpinButton" 
id="GNUNET_GTK_edit_file_information_expiration_year_spin_button">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="max_length">4</property>
+                        <property name="invisible_char">•</property>
+                        <property name="invisible_char_set">True</property>
+                        <property 
name="adjustment">expiration_year_adjustment</property>
+                        <property name="climb_rate">1</property>
+                        <property name="numeric">True</property>
+                      </object>
+                      <packing>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">8</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="padding">11</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="padding">5</property>
+            <property name="position">2</property>
+          </packing>
+        </child>
+        <child internal-child="action_area">
+          <object class="GtkHButtonBox" id="dialog-action_area13">
+            <property name="visible">True</property>
+            <property name="layout_style">end</property>
+            <child>
+              <object class="GtkButton" 
id="GNUNET_GTK_edit_file_information_cancel_button">
+                <property name="label">gtk-cancel</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_action_appearance">False</property>
+                <property name="use_stock">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" 
id="GNUNET_GTK_edit_file_information_confirm_button">
+                <property name="label">gtk-ok</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_action_appearance">False</property>
+                <property name="use_stock">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="pack_type">end</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+    <action-widgets>
+      <action-widget 
response="-6">GNUNET_GTK_edit_file_information_cancel_button</action-widget>
+      <action-widget 
response="-5">GNUNET_GTK_edit_file_information_confirm_button</action-widget>
+    </action-widgets>
+  </object>
+  <object class="GtkListStore" id="GNUNET_GTK_keyword_list_store">
+    <columns>
+      <!-- column-name keyword -->
+      <column type="gchararray"/>
+    </columns>
+  </object>
+  <object class="GtkAdjustment" id="GNUNET_GTK_anonymity_adjustment">
+    <property name="upper">100000</property>
+    <property name="value">1</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
+  <object class="GtkAdjustment" id="priority_adjustment">
+    <property name="upper">10000000</property>
+    <property name="value">1000</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
+  <object class="GtkAdjustment" id="expiration_year_adjustment">
+    <property name="upper">9999</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
+</interface>

Copied: gnunet-gtk/contrib/gnunet_fs_gtk_publish_file_dialog.glade (from rev 
16478, gnunet-gtk/contrib/publish-file-dialog.glade)
===================================================================
--- gnunet-gtk/contrib/gnunet_fs_gtk_publish_file_dialog.glade                  
        (rev 0)
+++ gnunet-gtk/contrib/gnunet_fs_gtk_publish_file_dialog.glade  2011-08-15 
14:20:33 UTC (rev 16549)
@@ -0,0 +1,216 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <requires lib="gtk+" version="2.20"/>
+  <!-- interface-naming-policy project-wide -->
+  <object class="GtkFileChooserDialog" id="GNUNET_GTK_publish_file_dialog">
+    <property name="can_default">True</property>
+    <property name="border_width">5</property>
+    <property name="title" translatable="yes">Publish file...</property>
+    <property name="type_hint">normal</property>
+    <property name="has_separator">False</property>
+    <property name="select_multiple">True</property>
+    <property name="create_folders">False</property>
+    <child internal-child="vbox">
+      <object class="GtkVBox" id="dialog-vbox1">
+        <property name="visible">True</property>
+        <property name="spacing">2</property>
+        <child>
+          <object class="GtkVBox" id="vbox1">
+            <property name="visible">True</property>
+            <child>
+              <object class="GtkHBox" id="hbox1">
+                <property name="visible">True</property>
+                <child>
+                  <object class="GtkCheckButton" 
id="GNUNET_GTK_publish_file_dialog_do_index_checkbutton">
+                    <property name="label" translatable="yes">Index 
file</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
+                    <property name="use_action_appearance">False</property>
+                    <property name="use_underline">True</property>
+                    <property name="active">True</property>
+                    <property name="draw_indicator">True</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="padding">20</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <placeholder/>
+                </child>
+                <child>
+                  <object class="GtkLabel" 
id="GNUNET_GTK_publish_file_dialog_priority_label">
+                    <property name="visible">True</property>
+                    <property name="label" 
translatable="yes">Priority:</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="padding">13</property>
+                    <property name="position">2</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkSpinButton" 
id="GNUNET_GTK_publish_file_dialog_priority_spin_button">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="invisible_char">•</property>
+                    <property name="adjustment">priority_adjustment</property>
+                    <property name="numeric">True</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="padding">20</property>
+                    <property name="position">3</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkHBox" id="hbox2">
+                <property name="visible">True</property>
+                <child>
+                  <object class="GtkLabel" 
id="GNUNET_GTK_publish_file_dialog_expiration_label">
+                    <property name="visible">True</property>
+                    <property name="label" translatable="yes">Expiration 
year:</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="padding">20</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkSpinButton" 
id="GNUNET_GTK_publish_file_dialog_expiration_year_spin_button">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="invisible_char">•</property>
+                    <property 
name="adjustment">expiration_year_adjustment</property>
+                    <property name="numeric">True</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" 
id="GNUNET_GTK_publish_file_dialog_anonymity_label">
+                    <property name="visible">True</property>
+                    <property name="label" 
translatable="yes">Anonymity:</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="padding">5</property>
+                    <property name="position">2</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkSpinButton" 
id="GNUNET_GTK_publish_file_dialog_anonymity_spin_button">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="invisible_char">•</property>
+                    <property name="adjustment">anonymity_adjustment</property>
+                    <property name="numeric">True</property>
+                    <signal name="value-changed" 
handler="GNUNET_GTK_anonymity_spin_button_value_changed_cb" swapped="no"/>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="padding">20</property>
+                    <property name="position">3</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="position">2</property>
+          </packing>
+        </child>
+        <child internal-child="action_area">
+          <object class="GtkHButtonBox" id="dialog-action_area2">
+            <property name="visible">True</property>
+            <property name="layout_style">end</property>
+            <child>
+              <object class="GtkButton" 
id="GNUNET_GTK_publish_file_dialog_cancel_button">
+                <property name="label">gtk-cancel</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_action_appearance">False</property>
+                <property name="use_stock">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" 
id="GNUNET_GTK_publish_file_dialog_ok_button">
+                <property name="label">gtk-ok</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_action_appearance">False</property>
+                <property name="use_stock">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="pack_type">end</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+    <action-widgets>
+      <action-widget 
response="-6">GNUNET_GTK_publish_file_dialog_cancel_button</action-widget>
+      <action-widget 
response="-5">GNUNET_GTK_publish_file_dialog_ok_button</action-widget>
+    </action-widgets>
+  </object>
+  <object class="GtkAdjustment" id="priority_adjustment">
+    <property name="upper">100000000</property>
+    <property name="value">1000</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
+  <object class="GtkListStore" 
id="GNUNET_GTK_publish_file_dialog_expiration_list_store">
+    <columns>
+      <!-- column-name human_readable_time -->
+      <column type="gchararray"/>
+      <!-- column-name time_in_ms -->
+      <column type="guint64"/>
+    </columns>
+  </object>
+  <object class="GtkAdjustment" id="anonymity_adjustment">
+    <property name="upper">10000000</property>
+    <property name="value">1</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
+  <object class="GtkAdjustment" id="expiration_year_adjustment">
+    <property name="upper">9999</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
+</interface>

Copied: gnunet-gtk/contrib/gnunet_fs_gtk_publish_tab.glade (from rev 16478, 
gnunet-gtk/contrib/publish_tab.glade)
===================================================================
--- gnunet-gtk/contrib/gnunet_fs_gtk_publish_tab.glade                          
(rev 0)
+++ gnunet-gtk/contrib/gnunet_fs_gtk_publish_tab.glade  2011-08-15 14:20:33 UTC 
(rev 16549)
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <requires lib="gtk+" version="2.20"/>
+  <!-- interface-naming-policy project-wide -->
+  <object class="GtkWindow" id="_publish_frame_window">
+    <property name="title">You should never see this</property>
+
+                   <child>
+                      <object class="GtkScrolledWindow" 
id="_publish_frame_scrolled_window">
+                        <property name="height_request">100</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="hscrollbar_policy">automatic</property>
+                        <property name="vscrollbar_policy">automatic</property>
+
+    <child>
+      <object class="GtkTreeView" id="_publish_frame">
+        <property name="visible">True</property>
+        <property name="can_focus">True</property>
+        <property name="model">_publish_frame_tree_store</property>
+        <property name="reorderable">True</property>
+        <property name="enable_tree_lines">True</property>
+        <child>
+          <object class="GtkTreeViewColumn" id="filename">
+            <property name="sizing">autosize</property>
+            <property name="title" translatable="yes">Filename</property>
+            <property name="expand">True</property>
+            <child>
+              <object class="GtkCellRendererProgress" id="filename_renderer"/>
+              <attributes>
+                <attribute name="cell-background">2</attribute>
+                <attribute name="text">0</attribute>
+                <attribute name="value">3</attribute>
+              </attributes>
+            </child>
+          </object>
+        </child>
+        <child>
+          <object class="GtkTreeViewColumn" id="filesize">
+            <property name="sizing">autosize</property>
+            <property name="title" translatable="yes">Size</property>
+            <child>
+              <object class="GtkCellRendererText" id="size_renderer"/>
+              <attributes>
+                <attribute name="background">2</attribute>
+                <attribute name="text">1</attribute>
+              </attributes>
+            </child>
+          </object>
+        </child>
+      </object>
+    </child>
+  </object>
+    </child>
+  </object>
+  <object class="GtkWindow" id="_publish_label_window">
+    <child>
+      <object class="GtkHBox" id="_publish_label_hbox">
+        <property name="visible">True</property>
+        <property name="border_width">5</property>
+        <child>
+          <object class="GtkLabel" id="_publish_label_window_label">
+            <property name="height_request">30</property>
+            <property name="visible">True</property>
+            <property name="label" translatable="yes">filename</property>
+          </object>
+          <packing>
+            <property name="fill">False</property>
+            <property name="padding">5</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkButton" id="_publish_label_close_button">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="receives_default">True</property>
+            <property name="use_action_appearance">False</property>
+            <property name="relief">half</property>
+            <child>
+              <object class="GtkImage" id="close_icon_stock_image">
+                <property name="visible">True</property>
+                <property name="stock">gtk-close</property>
+                <property name="icon-size">2</property>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+  </object>
+  <object class="GtkTreeStore" id="_publish_frame_tree_store">
+    <columns>
+      <!-- column-name filename -->
+      <column type="gchararray"/>
+      <!-- column-name filesize -->
+      <column type="gchararray"/>
+      <!-- column-name bgcolour -->
+      <column type="gchararray"/>
+      <!-- column-name progress -->
+      <column type="guint"/>
+    </columns>
+  </object>
+</interface>

Copied: gnunet-gtk/contrib/gnunet_fs_gtk_search_dialog.glade (from rev 16478, 
gnunet-gtk/contrib/search_dialog.glade)
===================================================================
--- gnunet-gtk/contrib/gnunet_fs_gtk_search_dialog.glade                        
        (rev 0)
+++ gnunet-gtk/contrib/gnunet_fs_gtk_search_dialog.glade        2011-08-15 
14:20:33 UTC (rev 16549)
@@ -0,0 +1,238 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <requires lib="gtk+" version="2.20"/>
+  <!-- interface-naming-policy project-wide -->
+  <object class="GtkAdjustment" id="adjustment2">
+    <property name="upper">100</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+    <property name="page_size">10</property>
+  </object>
+  <object class="GtkAdjustment" id="adjustment1">
+    <property name="upper">100</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+    <property name="page_size">10</property>
+  </object>
+  <object class="GtkAdjustment" id="GNUNET_GTK_search_anonymity_adjustment">
+    <property name="upper">100000</property>
+    <property name="value">1</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
+  <object class="GtkDialog" id="GNUNET_GTK_search_dialog">
+    <property name="width_request">500</property>
+    <property name="height_request">350</property>
+    <property name="border_width">5</property>
+    <property name="title" translatable="yes">Search GNUnet</property>
+    <property name="modal">True</property>
+    <property name="destroy_with_parent">True</property>
+    <property name="icon_name">system-search</property>
+    <property name="type_hint">dialog</property>
+    <property name="skip_taskbar_hint">True</property>
+    <property name="skip_pager_hint">True</property>
+    <property name="has_separator">False</property>
+    <child internal-child="vbox">
+      <object class="GtkVBox" id="GNUNET_GTK_search_dialog_main_vbox">
+        <property name="visible">True</property>
+        <property name="spacing">2</property>
+        <child>
+          <object class="GtkHBox" id="GNUNET_GTK_search_dialog_query_hbox">
+            <property name="visible">True</property>
+            <child>
+              <object class="GtkLabel" 
id="GNUNET_GTK_search_dialog_keyword_label">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">_Query:</property>
+                <property name="use_underline">True</property>
+                <property name="selectable">True</property>
+                <property 
name="mnemonic_widget">GNUNET_GTK_search_dialog_keyword_entry</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkEntry" 
id="GNUNET_GTK_search_dialog_keyword_entry">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="invisible_char">●</property>
+                <property name="activates_default">True</property>
+                <property name="caps_lock_warning">False</property>
+                <property name="primary_icon_stock">gtk-find</property>
+                <property name="primary_icon_tooltip_text" 
translatable="yes">Separate multiple keywords with spaces, prefix mandatory 
keywords with "+"</property>
+                <signal name="activate" 
handler="GNUNET_GTK_search_dialog_search_button_clicked_cb" swapped="no"/>
+              </object>
+              <packing>
+                <property name="position">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" 
id="GNUNET_GTK_search_dialog_anonymity_label">
+                <property name="visible">True</property>
+                <property name="label" 
translatable="yes">_Anonymity:</property>
+                <property name="use_underline">True</property>
+                <property name="selectable">True</property>
+                <property 
name="mnemonic_widget">GNUNET_GTK_search_dialog_anonymity_spin_button</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">2</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkSpinButton" 
id="GNUNET_GTK_search_dialog_anonymity_spin_button">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="invisible_char">●</property>
+                <property name="caps_lock_warning">False</property>
+                <property 
name="adjustment">GNUNET_GTK_search_anonymity_adjustment</property>
+                <property name="climb_rate">1</property>
+                <property name="numeric">True</property>
+                <signal name="value-changed" 
handler="GNUNET_GTK_anonymity_spin_button_value_changed_cb" swapped="no"/>
+              </object>
+              <packing>
+                <property name="position">3</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="padding">5</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkScrolledWindow" 
id="GNUNET_GTK_search_dialog_namespace_scrolled_window">
+            <property name="height_request">100</property>
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="hadjustment">adjustment1</property>
+            <property name="vadjustment">adjustment2</property>
+            <property name="hscrollbar_policy">automatic</property>
+            <property name="vscrollbar_policy">automatic</property>
+            <child>
+              <object class="GtkTreeView" 
id="GNUNET_GTK_search_dialog_namespace_tree_view">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property 
name="model">GNUNET_GTK_namespace_list_store</property>
+                <property name="hadjustment">adjustment1</property>
+                <property name="vadjustment">adjustment2</property>
+                <property name="reorderable">True</property>
+                <property name="rules_hint">True</property>
+                <signal name="row-activated" 
handler="GNUNET_GTK_search_dialog_namespace_tree_view_row_activated_cb" 
swapped="no"/>
+                <child>
+                  <object class="GtkTreeViewColumn" 
id="GNUNET_GTK_search_dialog_namespace_name_column">
+                    <property name="resizable">True</property>
+                    <property name="title" translatable="yes">Name</property>
+                    <property name="clickable">True</property>
+                    <property name="reorderable">True</property>
+                    <property name="sort_indicator">True</property>
+                    <child>
+                      <object class="GtkCellRendererText" 
id="GNUNET_GTK_search_dialog_namespace_name_renderer"/>
+                      <attributes>
+                        <attribute name="text">0</attribute>
+                      </attributes>
+                    </child>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkTreeViewColumn" 
id="GNUNET_GTK_search_dialog_namespace_root_column">
+                    <property name="resizable">True</property>
+                    <property name="title" translatable="yes">Root</property>
+                    <property name="clickable">True</property>
+                    <child>
+                      <object class="GtkCellRendererText" 
id="GNUNET_GTK_search_dialog_namespace_root_renderer"/>
+                      <attributes>
+                        <attribute name="text">1</attribute>
+                      </attributes>
+                    </child>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkTreeViewColumn" 
id="GNUNET_GTK_search_dialog_namespace_description_column">
+                    <property name="title" 
translatable="yes">Description</property>
+                    <property name="expand">True</property>
+                    <property name="clickable">True</property>
+                    <child>
+                      <object class="GtkCellRendererText" 
id="GNUNET_GTK_search_dialog_namespace_description_renderer">
+                        <property name="wrap_mode">word</property>
+                      </object>
+                      <attributes>
+                        <attribute name="text">3</attribute>
+                      </attributes>
+                    </child>
+                  </object>
+                </child>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="position">2</property>
+          </packing>
+        </child>
+        <child internal-child="action_area">
+          <object class="GtkHButtonBox" 
id="GNUNET_GTK_search_dialog_action_area">
+            <property name="visible">True</property>
+            <property name="layout_style">end</property>
+            <child>
+              <object class="GtkButton" 
id="GNUNET_GTK_search_dialog_cancel_button">
+                <property name="label">gtk-cancel</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_action_appearance">False</property>
+                <property name="use_stock">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" 
id="GNUNET_GTK_search_dialog_search_button">
+                <property name="label">gtk-find</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_action_appearance">False</property>
+                <property name="use_stock">True</property>
+                <signal name="clicked" 
handler="GNUNET_GTK_search_dialog_search_button_clicked_cb" swapped="no"/>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="pack_type">end</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+    <action-widgets>
+      <action-widget 
response="-6">GNUNET_GTK_search_dialog_cancel_button</action-widget>
+      <action-widget 
response="0">GNUNET_GTK_search_dialog_search_button</action-widget>
+    </action-widgets>
+  </object>
+  <object class="GtkListStore" id="GNUNET_GTK_namespace_list_store">
+    <columns>
+      <!-- column-name unique_name -->
+      <column type="gchararray"/>
+      <!-- column-name namespace_root -->
+      <column type="gchararray"/>
+      <!-- column-name nsid -->
+      <column type="gpointer"/>
+      <!-- column-name namespace_description -->
+      <column type="gchararray"/>
+    </columns>
+  </object>
+</interface>

Copied: gnunet-gtk/contrib/gnunet_fs_gtk_search_tab.glade (from rev 16478, 
gnunet-gtk/contrib/search_tab.glade)
===================================================================
--- gnunet-gtk/contrib/gnunet_fs_gtk_search_tab.glade                           
(rev 0)
+++ gnunet-gtk/contrib/gnunet_fs_gtk_search_tab.glade   2011-08-15 14:20:33 UTC 
(rev 16549)
@@ -0,0 +1,245 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <requires lib="gtk+" version="2.20"/>
+  <!-- interface-naming-policy project-wide -->
+  <object class="GtkTreeStore" id="GNUNET_GTK_file_sharing_result_tree_store">
+    <columns>
+      <!-- column-name metadata -->
+      <column type="gpointer"/>
+      <!-- column-name uri -->
+      <column type="gpointer"/>
+      <!-- column-name filesize -->
+      <column type="guint64"/>
+      <!-- column-name preview -->
+      <column type="GdkPixbuf"/>
+      <!-- column-name percent_progress -->
+      <column type="guint"/>
+      <!-- column-name percent_availability -->
+      <column type="guint"/>
+      <!-- column-name filename -->
+      <column type="gchararray"/>
+      <!-- column-name uri_as_string -->
+      <column type="gchararray"/>
+      <!-- column-name status_colour -->
+      <column type="gchararray"/>
+      <!-- column-name struct_search_result -->
+      <column type="gpointer"/>
+      <!-- column-name mimetype -->
+      <column type="gchararray"/>
+      <!-- column-name applicability_rank -->
+      <column type="guint"/>
+      <!-- column-name availability_certainty -->
+      <column type="guint"/>
+      <!-- column-name availability_rank -->
+      <column type="gint"/>
+    </columns>
+  </object>
+  <object class="GtkWindow" id="_search_result_frame_window">
+    <property name="title">You should never see this</property>
+                   <child>
+                      <object class="GtkScrolledWindow" 
id="_search_frame_scrolled_window">
+                        <property name="height_request">100</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="hscrollbar_policy">automatic</property>
+                        <property name="vscrollbar_policy">automatic</property>
+
+    <child>
+      <object class="GtkTreeView" id="_search_result_frame">
+        <property name="visible">True</property>
+        <property name="can_focus">True</property>
+        <property 
name="model">GNUNET_GTK_file_sharing_result_tree_store</property>
+        <property name="reorderable">True</property>
+        <property name="enable_grid_lines">horizontal</property>
+        <property name="enable_tree_lines">True</property>
+        <child>
+          <object class="GtkTreeViewColumn" 
id="search_result_description_column">
+            <property name="resizable">True</property>
+            <property name="sizing">autosize</property>
+            <property name="title" translatable="yes">Description</property>
+            <property name="expand">True</property>
+            <property name="clickable">True</property>
+            <property name="reorderable">True</property>
+            <property name="sort_indicator">True</property>
+            <property name="sort_column_id">6</property>
+            <child>
+              <object class="GtkCellRendererProgress" 
id="search_result_description_renderer"/>
+              <attributes>
+                <attribute name="cell-background">8</attribute>
+                <attribute name="text">6</attribute>
+                <attribute name="value">5</attribute>
+              </attributes>
+            </child>
+          </object>
+        </child>
+        <child>
+          <object class="GtkTreeViewColumn" id="search_result_mime_column">
+            <property name="sizing">autosize</property>
+            <property name="title" translatable="yes">Format</property>
+            <property name="clickable">True</property>
+            <property name="reorderable">True</property>
+            <property name="sort_indicator">True</property>
+            <property name="sort_column_id">10</property>
+            <child>
+              <object class="GtkCellRendererText" 
id="search_result_mime_renderer"/>
+              <attributes>
+                <attribute name="background">8</attribute>
+                <attribute name="text">10</attribute>
+              </attributes>
+            </child>
+          </object>
+        </child>
+        <child>
+          <object class="GtkTreeViewColumn" id="search_result_size_column">
+            <property name="sizing">autosize</property>
+            <property name="title" translatable="yes">Size</property>
+            <property name="reorderable">True</property>
+            <property name="sort_indicator">True</property>
+            <property name="sort_column_id">2</property>
+            <child>
+              <object class="GtkCellRendererProgress" 
id="search_result_size_renderer"/>
+              <attributes>
+                <attribute name="cell-background">8</attribute>
+                <attribute name="text">2</attribute>
+                <attribute name="value">4</attribute>
+              </attributes>
+            </child>
+          </object>
+        </child>
+        <child>
+          <object class="GtkTreeViewColumn" 
id="search_result_applicability_column">
+            <property name="sizing">autosize</property>
+            <property name="title">#</property>
+            <property name="reorderable">True</property>
+            <property name="sort_indicator">True</property>
+            <property name="sort_order">descending</property>
+            <property name="sort_column_id">11</property>
+            <child>
+              <object class="GtkCellRendererText" 
id="search_result_applicability_renderer"/>
+              <attributes>
+                <attribute name="background">8</attribute>
+                <attribute name="text">11</attribute>
+              </attributes>
+            </child>
+          </object>
+        </child>
+        <child>
+          <object class="GtkTreeViewColumn" id="search_result_preview_column">
+            <property name="min_width">128</property>
+            <property name="max_width">128</property>
+            <property name="title" translatable="yes">Preview</property>
+            <property name="reorderable">True</property>
+            <child>
+              <object class="GtkCellRendererPixbuf" 
id="search_result_preview_renderer"/>
+              <attributes>
+                <attribute name="pixbuf">3</attribute>
+              </attributes>
+            </child>
+          </object>
+        </child>
+      </object>
+    </child>
+  </object>
+    </child>
+  </object>
+  <object class="GtkWindow" id="_search_result_label_window">
+    <child>
+      <object class="GtkHBox" id="_search_result_label_hbox">
+        <property name="visible">True</property>
+        <property name="border_width">5</property>
+        <child>
+          <object class="GtkLabel" id="_search_result_label_window_label">
+            <property name="height_request">30</property>
+            <property name="visible">True</property>
+            <property name="label" translatable="yes">query</property>
+          </object>
+          <packing>
+            <property name="fill">False</property>
+            <property name="padding">5</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkButton" id="_search_result_label_play_button">
+            <property name="can_focus">True</property>
+            <property name="receives_default">True</property>
+            <property name="use_action_appearance">False</property>
+            <child>
+              <object class="GtkImage" id="play_icon_stock_image">
+                <property name="visible">True</property>
+                <property name="stock">gtk-media-play</property>
+                <property name="icon-size">2</property>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkButton" id="_search_result_label_pause_button">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="receives_default">True</property>
+            <property name="use_action_appearance">False</property>
+            <child>
+              <object class="GtkImage" id="pause_icon_stock_image">
+                <property name="visible">True</property>
+                <property name="stock">gtk-media-pause</property>
+                <property name="icon-size">2</property>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="position">2</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkButton" id="_search_result_label_clear_button">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="receives_default">True</property>
+            <property name="use_action_appearance">False</property>
+            <child>
+              <object class="GtkImage" id="clear_icon_stock_image">
+                <property name="visible">True</property>
+                <property name="stock">gtk-clear</property>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="padding">5</property>
+            <property name="position">3</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkButton" id="_search_result_label_close_button">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="receives_default">True</property>
+            <property name="use_action_appearance">False</property>
+            <property name="relief">half</property>
+            <child>
+              <object class="GtkImage" id="close_icon_stock_image">
+                <property name="visible">True</property>
+                <property name="stock">gtk-close</property>
+                <property name="icon-size">2</property>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="position">4</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+  </object>
+</interface>

Copied: gnunet-gtk/contrib/gnunet_fs_gtk_select_pseudonym_dialog.glade (from 
rev 16478, gnunet-gtk/contrib/select_pseudonym_dialog.glade)
===================================================================
--- gnunet-gtk/contrib/gnunet_fs_gtk_select_pseudonym_dialog.glade              
                (rev 0)
+++ gnunet-gtk/contrib/gnunet_fs_gtk_select_pseudonym_dialog.glade      
2011-08-15 14:20:33 UTC (rev 16549)
@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <requires lib="gtk+" version="2.20"/>
+  <!-- interface-naming-policy project-wide -->
+  <object class="GtkAdjustment" id="adjustment2">
+    <property name="upper">100</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+    <property name="page_size">10</property>
+  </object>
+  <object class="GtkAdjustment" id="adjustment1">
+    <property name="upper">100</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+    <property name="page_size">10</property>
+  </object>
+  <object class="GtkDialog" id="GNUNET_GTK_select_pseudonym_dialog">
+    <property name="border_width">5</property>
+    <property name="title" translatable="yes">Select pseudonym...</property>
+    <property name="modal">True</property>
+    <property name="type_hint">normal</property>
+    <property name="has_separator">False</property>
+    <child internal-child="vbox">
+      <object class="GtkVBox" id="GNUNET_GTK_select_pseudonym_dialog_vbox">
+        <property name="visible">True</property>
+        <property name="spacing">2</property>
+        <child>
+          <object class="GtkScrolledWindow" 
id="GNUNET_GTK_select_pseudonym_scrolledwindow">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="hadjustment">adjustment1</property>
+            <property name="vadjustment">adjustment2</property>
+            <property name="hscrollbar_policy">automatic</property>
+            <property name="vscrollbar_policy">automatic</property>
+            <child>
+              <object class="GtkTreeView" 
id="GNUNET_GTK_select_pseudonym_tree_view">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property 
name="model">GNUNET_GTK_select_pseudonym_liststore</property>
+                <property name="hadjustment">adjustment1</property>
+                <property name="vadjustment">adjustment2</property>
+                <child>
+                  <object class="GtkTreeViewColumn" 
id="GNUNET_GTK_select_pseudonym_tree_view_column">
+                    <property name="title" translatable="yes">Name</property>
+                    <property name="expand">True</property>
+                    <property name="clickable">True</property>
+                    <property name="reorderable">True</property>
+                    <property name="sort_indicator">True</property>
+                    <property name="sort_column_id">0</property>
+                    <child>
+                      <object class="GtkCellRendererText" 
id="GNUNET_GTK_select_pseudonym_name_renderer"/>
+                      <attributes>
+                        <attribute name="text">0</attribute>
+                      </attributes>
+                    </child>
+                  </object>
+                </child>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child>
+          <placeholder/>
+        </child>
+        <child internal-child="action_area">
+          <object class="GtkHButtonBox" 
id="GNUNET_GTK_select_pseudonym_dialog_action_area">
+            <property name="visible">True</property>
+            <property name="layout_style">end</property>
+            <child>
+              <object class="GtkButton" 
id="GNUNET_GTK_select_pseudonym_cancel_button">
+                <property name="label">gtk-cancel</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_action_appearance">False</property>
+                <property name="use_stock">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" 
id="GNUNET_GTK_select_pseudonym_ok_button">
+                <property name="label">gtk-ok</property>
+                <property name="visible">True</property>
+                <property name="sensitive">False</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_action_appearance">False</property>
+                <property name="use_stock">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="pack_type">end</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+    <action-widgets>
+      <action-widget 
response="-6">GNUNET_GTK_select_pseudonym_cancel_button</action-widget>
+      <action-widget 
response="-5">GNUNET_GTK_select_pseudonym_ok_button</action-widget>
+    </action-widgets>
+  </object>
+  <object class="GtkListStore" id="GNUNET_GTK_select_pseudonym_liststore">
+    <columns>
+      <!-- column-name namespace_name -->
+      <column type="gchararray"/>
+      <!-- column-name namespace_handle -->
+      <column type="gpointer"/>
+    </columns>
+  </object>
+</interface>

Copied: gnunet-gtk/contrib/gnunet_gtk_status_bar_menu.glade (from rev 16478, 
gnunet-gtk/contrib/status_bar_menu.glade)
===================================================================
--- gnunet-gtk/contrib/gnunet_gtk_status_bar_menu.glade                         
(rev 0)
+++ gnunet-gtk/contrib/gnunet_gtk_status_bar_menu.glade 2011-08-15 14:20:33 UTC 
(rev 16549)
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <requires lib="gtk+" version="2.20"/>
+  <!-- interface-naming-policy project-wide -->
+  <object class="GtkMenu" id="GNUNET_GTK_status_bar_popup_menu">
+    <property name="visible">True</property>
+    <child>
+      <object class="GtkImageMenuItem" 
id="GNUNET_GTK_status_bar_popup_menu_quit">
+        <property name="label">gtk-quit</property>
+        <property name="visible">True</property>
+        <property name="tooltip_text" translatable="yes">Quit</property>
+        <property name="use_action_appearance">False</property>
+        <property name="use_underline">True</property>
+        <property name="use_stock">True</property>
+        <property name="always_show_image">True</property>
+        <signal name="activate" handler="GNUNET_GTK_quit_cb" swapped="no"/>
+      </object>
+    </child>
+  </object>
+</interface>

Copied: gnunet-gtk/contrib/gnunet_setup_gtk_main_window.glade (from rev 16514, 
gnunet-setup/contrib/gnunet-setup.glade)
===================================================================
--- gnunet-gtk/contrib/gnunet_setup_gtk_main_window.glade                       
        (rev 0)
+++ gnunet-gtk/contrib/gnunet_setup_gtk_main_window.glade       2011-08-15 
14:20:33 UTC (rev 16549)
@@ -0,0 +1,4227 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <requires lib="gtk+" version="2.20"/>
+  <object class="GtkAdjustment" id="GNUNET_setup_bandwidth_in_adjustment">
+    <property name="lower">5000</property>
+    <property name="upper">999999999</property>
+    <property name="value">65536</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
+  <object class="GtkAdjustment" id="GNUNET_setup_bandwidth_out_adjustment">
+    <property name="lower">1024</property>
+    <property name="upper">999999999</property>
+    <property name="value">65536</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
+  <object class="GtkDialog" id="GNUNET_setup_dialog">
+    <property name="can_focus">False</property>
+    <property name="border_width">5</property>
+    <property name="title" translatable="yes">gnunet-setup</property>
+    <property name="window_position">center</property>
+    <property name="default_width">800</property>
+    <property name="default_height">550</property>
+    <property name="icon_name">preferences-system</property>
+    <property name="type_hint">dialog</property>
+    <child internal-child="vbox">
+      <object class="GtkBox" id="GNUNET_setup_dialog-vbox">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="orientation">vertical</property>
+        <property name="spacing">2</property>
+        <child internal-child="action_area">
+          <object class="GtkButtonBox" id="GNUNET_setup_dialog-action_area">
+            <property name="can_focus">False</property>
+            <property name="layout_style">end</property>
+            <child>
+              <object class="GtkButton" id="GNUNET_setup_cancel_button">
+                <property name="label">gtk-cancel</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_action_appearance">False</property>
+                <property name="use_stock">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="GNUNET_setup_save_as_button">
+                <property name="label">gtk-save-as</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_action_appearance">False</property>
+                <property name="use_stock">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="GNUNET_setup_save_button">
+                <property name="label">gtk-save</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_action_appearance">False</property>
+                <property name="use_stock">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">2</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="pack_type">end</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkNotebook" id="GNUNET_setup_notebook">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <child>
+              <object class="GtkVBox" id="GNUNET_setup_general_vbox">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <child>
+                  <object class="GtkFrame" 
id="GNUNET_setup_defaultservices_frame">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="label_xalign">0</property>
+                    <property name="shadow_type">none</property>
+                    <child>
+                      <object class="GtkAlignment" 
id="GNUNET_setup_defaultservices_alignment">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="left_padding">12</property>
+                        <child>
+                          <object class="GtkHBox" 
id="GNUNET_setup_defaultservices_hbox">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <child>
+                              <object class="GtkLabel" 
id="GNUNET_setup_general_services_label">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="label" 
translatable="yes">Services:</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="padding">5</property>
+                                <property name="position">0</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkCheckButton" 
id="GNUNET_setup_general_services_topology_checkbutton">
+                                <property name="label" 
translatable="yes">Topology</property>
+                                <property name="visible">True</property>
+                                <property name="sensitive">False</property>
+                                <property name="can_focus">True</property>
+                                <property 
name="receives_default">False</property>
+                                <property 
name="use_action_appearance">False</property>
+                                <property name="xalign">0</property>
+                                <property name="active">True</property>
+                                <property name="draw_indicator">True</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="padding">5</property>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkCheckButton" 
id="GNUNET_setup_general_services_hostlist_checkbutton">
+                                <property name="label" 
translatable="yes">Hostlist</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property 
name="receives_default">False</property>
+                                <property 
name="use_action_appearance">False</property>
+                                <property name="xalign">0</property>
+                                <property name="active">True</property>
+                                <property name="draw_indicator">True</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="padding">5</property>
+                                <property name="position">2</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkCheckButton" 
id="GNUNET_setup_general_services_fs_checkbutton">
+                                <property name="label" translatable="yes">File 
_Sharing</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property 
name="receives_default">False</property>
+                                <property 
name="use_action_appearance">False</property>
+                                <property name="use_underline">True</property>
+                                <property name="xalign">0</property>
+                                <property name="active">True</property>
+                                <property name="draw_indicator">True</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="padding">5</property>
+                                <property name="position">3</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkCheckButton" 
id="GNUNET_setup_general_services_vpn_checkbutton">
+                                <property name="label" 
translatable="yes">_VPN</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property 
name="receives_default">False</property>
+                                <property 
name="use_action_appearance">False</property>
+                                <property name="use_underline">True</property>
+                                <property name="xalign">0</property>
+                                <property name="draw_indicator">True</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">4</property>
+                              </packing>
+                            </child>
+                          </object>
+                        </child>
+                      </object>
+                    </child>
+                    <child type="label">
+                      <object class="GtkLabel" 
id="GNUNET_setup_defaultservices_label">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="label" 
translatable="yes">&lt;b&gt;Service Configuration&lt;/b&gt;</property>
+                        <property name="use_markup">True</property>
+                      </object>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="padding">5</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkFrame" id="GNUNET_setup_topology_frame">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="label_xalign">0</property>
+                    <property name="shadow_type">none</property>
+                    <child>
+                      <object class="GtkAlignment" 
id="GNUNET_setup_topology_alignment">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="left_padding">12</property>
+                        <child>
+                          <object class="GtkHBox" 
id="GNUNET_setup_topology_hbox">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <child>
+                              <object class="GtkCheckButton" 
id="GNUNET_setup_friends_only_checkbutton">
+                                <property name="label" translatable="yes">F_2F 
only</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property 
name="receives_default">False</property>
+                                <property 
name="use_action_appearance">False</property>
+                                <property name="use_underline">True</property>
+                                <property name="xalign">0</property>
+                                <property name="draw_indicator">True</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="position">0</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkVSeparator" id="vseparator2">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="padding">5</property>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkLabel" 
id="GNUNET_setup_friends_file_label">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="label" 
translatable="yes">Friends file:</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="position">2</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkFileChooserButton" 
id="GNUNET_setup_friends_filechooserbutton">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                              </object>
+                              <packing>
+                                <property name="expand">True</property>
+                                <property name="fill">True</property>
+                                <property name="position">3</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkVSeparator" id="vseparator1">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="padding">5</property>
+                                <property name="position">4</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkLabel" 
id="GNUNET_setup_minimum_friends_label">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="label" translatable="yes">Min. 
connected friends:</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="position">5</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkSpinButton" 
id="GNUNET_setup_minimum_friends_spinbutton">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="invisible_char">•</property>
+                                <property 
name="invisible_char_set">True</property>
+                                <property 
name="adjustment">GNUNET_setup_min_friends_adjustment</property>
+                                <property name="numeric">True</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="position">6</property>
+                              </packing>
+                            </child>
+                          </object>
+                        </child>
+                      </object>
+                    </child>
+                    <child type="label">
+                      <object class="GtkLabel" 
id="GNUNET_setup_topology_label">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="label" 
translatable="yes">&lt;b&gt;Friend-to-Friend Configuration (restricts P2P 
connections)&lt;/b&gt;</property>
+                        <property name="use_markup">True</property>
+                      </object>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="padding">5</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkFrame" id="GNUNET_setup_hostlist_frame">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="label_xalign">0</property>
+                    <property name="shadow_type">none</property>
+                    <child>
+                      <object class="GtkAlignment" 
id="GNUNET_setup_hostlist_alignment">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="left_padding">12</property>
+                        <child>
+                          <object class="GtkVBox" 
id="GNUNET_setup_hostlist_vbox">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <child>
+                              <object class="GtkHBox" 
id="GNUNET_setup_hostlist_basics_hbox">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <child>
+                                  <object class="GtkCheckButton" 
id="GNUNET_setup_hostlist_client_enable_checkbutton">
+                                    <property name="label" 
translatable="yes">Use Hostlists to bootstrap</property>
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property 
name="receives_default">False</property>
+                                    <property 
name="use_action_appearance">False</property>
+                                    <property name="xalign">0</property>
+                                    <property 
name="draw_indicator">True</property>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                    <property name="padding">5</property>
+                                    <property name="position">0</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkCheckButton" 
id="GNUNET_setup_hostlist_client_learn_checkbutton">
+                                    <property name="label" 
translatable="yes">Learn Servers from P2P Network</property>
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property 
name="receives_default">False</property>
+                                    <property 
name="use_action_appearance">False</property>
+                                    <property name="xalign">0</property>
+                                    <property 
name="draw_indicator">True</property>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                    <property name="padding">5</property>
+                                    <property name="position">1</property>
+                                  </packing>
+                                </child>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="position">0</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkHBox" 
id="GNUNET_setup_hostlist_options_hbox">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <child>
+                                  <object class="GtkVBox" 
id="GNUNET_setup_hostlist_server_vbox">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <child>
+                                      <object class="GtkCheckButton" 
id="GNUNET_setup_hostlist_offer_hostlist_checkbutton">
+                                        <property name="label" 
translatable="yes">Run Hostlist Server</property>
+                                        <property 
name="visible">True</property>
+                                        <property 
name="can_focus">True</property>
+                                        <property 
name="receives_default">False</property>
+                                        <property 
name="use_action_appearance">False</property>
+                                        <property name="xalign">0</property>
+                                        <property 
name="draw_indicator">True</property>
+                                      </object>
+                                      <packing>
+                                        <property 
name="expand">False</property>
+                                        <property name="fill">False</property>
+                                        <property name="position">0</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkCheckButton" 
id="GNUNET_setup_hostlist_advertise_checkbutton">
+                                        <property name="label" 
translatable="yes">Advertise Hostlist Server</property>
+                                        <property 
name="visible">True</property>
+                                        <property 
name="can_focus">True</property>
+                                        <property 
name="receives_default">False</property>
+                                        <property 
name="use_action_appearance">False</property>
+                                        <property name="xalign">0</property>
+                                        <property 
name="draw_indicator">True</property>
+                                      </object>
+                                      <packing>
+                                        <property 
name="expand">False</property>
+                                        <property name="fill">False</property>
+                                        <property name="position">1</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkHBox" id="hbox9">
+                                        <property 
name="visible">True</property>
+                                        <property 
name="can_focus">False</property>
+                                        <child>
+                                          <object class="GtkLabel" 
id="GNUNET_setup_hostlist_port_label">
+                                            <property 
name="visible">True</property>
+                                            <property 
name="can_focus">False</property>
+                                            <property name="label" 
translatable="yes">Port:</property>
+                                          </object>
+                                          <packing>
+                                            <property 
name="expand">False</property>
+                                            <property 
name="fill">False</property>
+                                            <property 
name="padding">5</property>
+                                            <property 
name="position">0</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkSpinButton" 
id="GNUNET_setup_hostlist_server_port_spin_button">
+                                            <property 
name="visible">True</property>
+                                            <property 
name="can_focus">True</property>
+                                            <property 
name="invisible_char">•</property>
+                                            <property 
name="invisible_char_set">True</property>
+                                            <property 
name="adjustment">GNUNET_setup_hostlist_server_port_adjustment</property>
+                                            <property 
name="numeric">True</property>
+                                          </object>
+                                          <packing>
+                                            <property 
name="expand">False</property>
+                                            <property 
name="fill">False</property>
+                                            <property 
name="padding">5</property>
+                                            <property 
name="position">1</property>
+                                          </packing>
+                                        </child>
+                                      </object>
+                                      <packing>
+                                        <property 
name="expand">False</property>
+                                        <property name="fill">False</property>
+                                        <property name="position">2</property>
+                                      </packing>
+                                    </child>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                    <property name="padding">5</property>
+                                    <property name="position">0</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkVBox" 
id="GNUNET_setup_hostlist_vbox ">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <child>
+                                      <object class="GtkLabel" 
id="GNUNET_setup_hostlist_url_label">
+                                        <property 
name="visible">True</property>
+                                        <property 
name="can_focus">False</property>
+                                        <property name="label" 
translatable="yes">Known Hostlist Servers:</property>
+                                      </object>
+                                      <packing>
+                                        <property 
name="expand">False</property>
+                                        <property name="fill">False</property>
+                                        <property name="padding">5</property>
+                                        <property name="position">0</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkScrolledWindow" 
id="GNUNET_setup_hostlist_url_scrolledwindow">
+                                        <property 
name="visible">True</property>
+                                        <property 
name="can_focus">True</property>
+                                        <property 
name="hadjustment">adjustment7</property>
+                                        <property 
name="vadjustment">adjustment8</property>
+                                        <property 
name="hscrollbar_policy">never</property>
+                                        <child>
+                                          <object class="GtkTreeView" 
id="GNUNET_setup_hostlist_url_treeview">
+                                            <property 
name="visible">True</property>
+                                            <property 
name="can_focus">True</property>
+                                            <property 
name="hadjustment">adjustment7</property>
+                                            <property 
name="vadjustment">adjustment8</property>
+                                            <property 
name="model">GNUNET_setup_hostlist_url_liststore</property>
+                                            <property 
name="search_column">0</property>
+                                            <signal name="key-press-event" 
handler="GNUNET_setup_treeview_key_press_event_cb" swapped="no"/>
+                                            <child internal-child="selection">
+                                              <object class="GtkTreeSelection" 
id="treeview-selection"/>
+                                            </child>
+                                            <child>
+                                              <object 
class="GtkTreeViewColumn" id="GNUNET_setup_hostlist_url_treeviewcolumn">
+                                                <property name="title" 
translatable="yes">URL</property>
+                                                <property 
name="clickable">True</property>
+                                                <property 
name="reorderable">True</property>
+                                                <property 
name="sort_indicator">True</property>
+                                                <property 
name="sort_column_id">0</property>
+                                                <child>
+                                                  <object 
class="GtkCellRendererText" id="GNUNET_setup_hostlist_url_cellrenderertext">
+                                                    <signal name="edited" 
handler="GNUNET_setup_hostlist_url_cellrenderertext_edited_cb" swapped="no"/>
+                                                  </object>
+                                                  <attributes>
+                                                    <attribute 
name="editable">1</attribute>
+                                                    <attribute 
name="text">0</attribute>
+                                                  </attributes>
+                                                </child>
+                                              </object>
+                                            </child>
+                                          </object>
+                                        </child>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">True</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">1</property>
+                                      </packing>
+                                    </child>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">True</property>
+                                    <property name="fill">True</property>
+                                    <property name="position">1</property>
+                                  </packing>
+                                </child>
+                              </object>
+                              <packing>
+                                <property name="expand">True</property>
+                                <property name="fill">True</property>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                          </object>
+                        </child>
+                      </object>
+                    </child>
+                    <child type="label">
+                      <object class="GtkLabel" 
id="GNUNET_setup_hostlist_label">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="label" 
translatable="yes">&lt;b&gt;Hostlist Configuration (for bootstrapping the 
network)&lt;/b&gt;</property>
+                        <property name="use_markup">True</property>
+                      </object>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
+                    <property name="padding">5</property>
+                    <property name="position">2</property>
+                  </packing>
+                </child>
+              </object>
+            </child>
+            <child type="tab">
+              <object class="GtkLabel" id="GNUNET_setup_general_label">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">_General</property>
+                <property name="use_underline">True</property>
+              </object>
+              <packing>
+                <property name="tab_fill">False</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkVBox" id="GNUNET_setup_network_tab_vbox">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <child>
+                  <object class="GtkFrame" id="GNUNET_setup_bandwidth_frame">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="label_xalign">0</property>
+                    <property name="shadow_type">none</property>
+                    <child>
+                      <object class="GtkAlignment" 
id="GNUNET_setup_bandwidth_alignment">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="left_padding">12</property>
+                        <child>
+                          <object class="GtkVBox" 
id="GNUNET_setup_bandwidth_vbox">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <child>
+                              <object class="GtkHBox" 
id="GNUNET_setup_bandwidth_hbox">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <child>
+                                  <object class="GtkLabel" 
id="GNUNET_setup_bandwidth_in_label">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="label" 
translatable="yes">Max. download bandwidth (B/s):</property>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                    <property name="padding">5</property>
+                                    <property name="position">0</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkSpinButton" 
id="GNUNET_setup_bandwidth_in_spinbutton">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property 
name="invisible_char">•</property>
+                                    <property 
name="invisible_char_set">True</property>
+                                    <property 
name="adjustment">GNUNET_setup_bandwidth_in_adjustment</property>
+                                    <property name="numeric">True</property>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                    <property name="position">1</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkLabel" 
id="GNUNET_setup_bandwidth_out_label">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="label" 
translatable="yes">Max. upload bandwidth (B/s)</property>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">True</property>
+                                    <property name="fill">True</property>
+                                    <property name="position">2</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkSpinButton" 
id="GNUNET_setup_bandwidth_out_spinbutton">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property 
name="invisible_char">•</property>
+                                    <property 
name="invisible_char_set">True</property>
+                                    <property 
name="adjustment">GNUNET_setup_bandwidth_out_adjustment</property>
+                                    <property name="numeric">True</property>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">True</property>
+                                    <property name="fill">True</property>
+                                    <property name="position">3</property>
+                                  </packing>
+                                </child>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="position">0</property>
+                              </packing>
+                            </child>
+                          </object>
+                        </child>
+                      </object>
+                    </child>
+                    <child type="label">
+                      <object class="GtkLabel" 
id="GNUNET_setup_bandwidth_label">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="label" 
translatable="yes">&lt;b&gt;Bandwidth Configuration&lt;/b&gt;</property>
+                        <property name="use_markup">True</property>
+                      </object>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkFrame" 
id="GNUNET_setup_transport_nat_frame">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="label_xalign">0</property>
+                    <property name="shadow_type">none</property>
+                    <child>
+                      <object class="GtkAlignment" 
id="GNUNET_setup_transport_nat_alignment">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="left_padding">12</property>
+                        <child>
+                          <object class="GtkVBox" 
id="GNUNET_setup_transport_nat_vbox">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <child>
+                              <object class="GtkHBox" 
id="GNUNET_setup_transport_nat_hbox">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <child>
+                                  <object class="GtkCheckButton" 
id="GNUNET_setup_transport_nat_checkbutton">
+                                    <property name="label" 
translatable="yes">Peer is behind _NAT</property>
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property 
name="receives_default">False</property>
+                                    <property name="tooltip_text" 
translatable="yes">Check this box if your machine is behind a NAT box (router 
that performs network address translation).  Leave off if your machine has a 
globally unique IPv4 address.  NAT options only impact IPv4 addresses at this 
time.</property>
+                                    <property 
name="use_action_appearance">False</property>
+                                    <property 
name="use_underline">True</property>
+                                    <property name="xalign">0</property>
+                                    <property 
name="draw_indicator">True</property>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                    <property name="padding">5</property>
+                                    <property name="position">0</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkButton" 
id="GNUNET_setup_transport_autoconfig_button">
+                                    <property name="label" 
translatable="yes">Attempt automatic configuration</property>
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property 
name="receives_default">True</property>
+                                    <property 
name="use_action_appearance">False</property>
+                                    <signal name="clicked" 
handler="GNUNET_setup_transport_autoconfig_button_clicked_cb" swapped="no"/>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                    <property name="padding">5</property>
+                                    <property name="position">1</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkCheckButton" 
id="GNUNET_setup_transport_disable_ipv6_checkbutton">
+                                    <property name="label" 
translatable="yes">Disable IPv_6 support</property>
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property 
name="receives_default">False</property>
+                                    <property name="tooltip_text" 
translatable="yes">Disable advertising IPv6 addresses. Check this box if you 
know that your system has no IPv6 Internet connectivity.</property>
+                                    <property 
name="use_action_appearance">False</property>
+                                    <property 
name="use_underline">True</property>
+                                    <property name="xalign">0</property>
+                                    <property 
name="draw_indicator">True</property>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                    <property name="padding">5</property>
+                                    <property name="position">2</property>
+                                  </packing>
+                                </child>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="padding">5</property>
+                                <property name="position">0</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkHBox" 
id="GNUNET_setup_transport_nat_options_hbox">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="spacing">20</property>
+                                <child>
+                                  <object class="GtkLabel" 
id="GNUNET_setup_transport_nat_options_spacer_label">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                    <property name="padding">5</property>
+                                    <property name="position">0</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkVBox" 
id="GNUNET_setup_transport_nat_options_vbox">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <child>
+                                      <object class="GtkCheckButton" 
id="GNUNET_setup_transport_hole_punched_checkbutton">
+                                        <property name="label" 
translatable="yes">NAT has been hole-punched manually</property>
+                                        <property 
name="visible">True</property>
+                                        <property 
name="can_focus">True</property>
+                                        <property 
name="receives_default">False</property>
+                                        <property name="tooltip_text" 
translatable="yes">Set this option if you have configured your NAT to forward 
the ports for the various enabled GNUnet transports.  If the external ports are 
different, the respective values of the external port should be specified under 
"advertised port" for the respective transport. You also need to specify the 
"External (public) IPv4 address" of your NAT box below.</property>
+                                        <property 
name="use_action_appearance">False</property>
+                                        <property name="xalign">0</property>
+                                        <property 
name="draw_indicator">True</property>
+                                      </object>
+                                      <packing>
+                                        <property 
name="expand">False</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">0</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkCheckButton" 
id="GNUNET_setup_transport_upnp_enable_checkbutton">
+                                        <property name="label" 
translatable="yes">Enable NAT traversal via UPnP or PMP</property>
+                                        <property 
name="visible">True</property>
+                                        <property 
name="can_focus">True</property>
+                                        <property 
name="receives_default">False</property>
+                                        <property name="tooltip_text" 
translatable="yes">This option enables the use of upnpc from miniupnpd for NAT 
traversal</property>
+                                        <property 
name="use_action_appearance">False</property>
+                                        <property name="xalign">0</property>
+                                        <property 
name="draw_indicator">True</property>
+                                      </object>
+                                      <packing>
+                                        <property 
name="expand">False</property>
+                                        <property name="fill">False</property>
+                                        <property name="position">1</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkCheckButton" 
id="GNUNET_setup_transport_icmp_server_enable_checkbutton">
+                                        <property name="label" 
translatable="yes">Enable NAT traversal using ICMP method</property>
+                                        <property 
name="visible">True</property>
+                                        <property 
name="can_focus">True</property>
+                                        <property 
name="receives_default">False</property>
+                                        <property name="tooltip_text" 
translatable="yes">This option enables the use of the "Autonomous NAT 
Traversal" method (presented at P2P 2010).  It requires 
gnunet-helper-nat-server to be installed SUID on the local system.</property>
+                                        <property 
name="use_action_appearance">False</property>
+                                        <property name="xalign">0</property>
+                                        <property 
name="draw_indicator">True</property>
+                                      </object>
+                                      <packing>
+                                        <property 
name="expand">False</property>
+                                        <property name="fill">False</property>
+                                        <property name="position">2</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkHBox" 
id="GNUNET_setup_transport_external_ip_hbox">
+                                        <property 
name="visible">True</property>
+                                        <property 
name="can_focus">False</property>
+                                        <child>
+                                          <object class="GtkLabel" 
id="GNUNET_setup_transport_external_ip_label">
+                                            <property 
name="visible">True</property>
+                                            <property 
name="can_focus">False</property>
+                                            <property name="tooltip_text" 
translatable="yes">Globally visible IP address of your system (IP address of 
the external interface of your NAT).  You can also specify a hostname, in which 
case GNUnet will periodically look up the hostname in DNS to determine our 
external IP address (DynDNS setup).</property>
+                                            <property name="label" 
translatable="yes">External (public) IPv4 address:</property>
+                                          </object>
+                                          <packing>
+                                            <property 
name="expand">False</property>
+                                            <property 
name="fill">False</property>
+                                            <property 
name="padding">5</property>
+                                            <property 
name="position">0</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkEntry" 
id="GNUNET_setup_transport_external_ip_address_entry">
+                                            <property 
name="visible">True</property>
+                                            <property 
name="can_focus">True</property>
+                                            <property 
name="max_length">15</property>
+                                            <property 
name="invisible_char">●</property>
+                                            <property 
name="invisible_char_set">True</property>
+                                          </object>
+                                          <packing>
+                                            <property 
name="expand">True</property>
+                                            <property 
name="fill">True</property>
+                                            <property 
name="padding">5</property>
+                                            <property 
name="position">1</property>
+                                          </packing>
+                                        </child>
+                                      </object>
+                                      <packing>
+                                        <property 
name="expand">False</property>
+                                        <property name="fill">False</property>
+                                        <property name="position">3</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkCheckButton" 
id="GNUNET_setup_transport_icmp_client_enable_checkbutton">
+                                        <property name="label" 
translatable="yes">Enable connecting to NATed peers using ICMP method</property>
+                                        <property 
name="visible">True</property>
+                                        <property 
name="can_focus">True</property>
+                                        <property 
name="receives_default">False</property>
+                                        <property name="tooltip_text" 
translatable="yes">This method allows this peer to initiate connections to 
NATed peers using the 'Autonomous NAT traversal' method (presented at P2P 
2010). It requires having gnunet-helper-nat-client installed SUID on the local 
system.</property>
+                                        <property 
name="use_action_appearance">False</property>
+                                        <property name="xalign">0</property>
+                                        <property name="active">True</property>
+                                        <property 
name="draw_indicator">True</property>
+                                      </object>
+                                      <packing>
+                                        <property 
name="expand">False</property>
+                                        <property name="fill">False</property>
+                                        <property name="position">4</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkHBox" 
id="GNUNET_setup_transport_internal_ip_hbox">
+                                        <property 
name="visible">True</property>
+                                        <property 
name="can_focus">False</property>
+                                        <child>
+                                          <object class="GtkLabel" 
id="GNUNET_setup_transport_internal_ip_label">
+                                            <property 
name="visible">True</property>
+                                            <property 
name="can_focus">False</property>
+                                            <property name="tooltip_text" 
translatable="yes">Specify the IPv4 address of your computers main network 
interface (typically eth0 or wlan0).</property>
+                                            <property name="label" 
translatable="yes">Internal (private) IPv4 address:</property>
+                                          </object>
+                                          <packing>
+                                            <property 
name="expand">False</property>
+                                            <property 
name="fill">False</property>
+                                            <property 
name="padding">5</property>
+                                            <property 
name="position">0</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkEntry" 
id="GNUNET_setup_transport_internal_ip_entry">
+                                            <property 
name="visible">True</property>
+                                            <property 
name="can_focus">True</property>
+                                            <property 
name="max_length">15</property>
+                                            <property 
name="invisible_char">●</property>
+                                            <property 
name="width_chars">15</property>
+                                          </object>
+                                          <packing>
+                                            <property 
name="expand">True</property>
+                                            <property 
name="fill">True</property>
+                                            <property 
name="position">1</property>
+                                          </packing>
+                                        </child>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">True</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">5</property>
+                                      </packing>
+                                    </child>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">True</property>
+                                    <property name="fill">True</property>
+                                    <property name="position">1</property>
+                                  </packing>
+                                </child>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="padding">5</property>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                          </object>
+                        </child>
+                      </object>
+                    </child>
+                    <child type="label">
+                      <object class="GtkLabel" 
id="GNUNET_setup_transport_nat_label">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="label" translatable="yes">&lt;b&gt;NAT 
Traversal Configuration&lt;/b&gt;</property>
+                        <property name="use_markup">True</property>
+                      </object>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
+                    <property name="padding">5</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="position">1</property>
+              </packing>
+            </child>
+            <child type="tab">
+              <object class="GtkLabel" id="GNUNET_setup_network_label">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">_Network</property>
+                <property name="use_underline">True</property>
+              </object>
+              <packing>
+                <property name="position">1</property>
+                <property name="tab_fill">False</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkFrame" id="GNUNET_setup_transport_main_frame">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label_xalign">0</property>
+                <property name="shadow_type">none</property>
+                <child>
+                  <object class="GtkAlignment" 
id="GNUNET_setup_transport_main_alignment">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="left_padding">12</property>
+                    <child>
+                      <object class="GtkVBox" 
id="GNUNET_setup_transport_main_vbox">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="spacing">5</property>
+                        <child>
+                          <object class="GtkHBox" 
id="GNUNET_setup_transport_plugins_hbox">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <child>
+                              <object class="GtkLabel" 
id="GNUNET_setup_transportlabel">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="label" 
translatable="yes">Plugins to use:</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="padding">5</property>
+                                <property name="position">0</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkCheckButton" 
id="GNUNET_setup_transport_tcp_checkbutton">
+                                <property name="label" 
translatable="yes">_TCP</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property 
name="receives_default">False</property>
+                                <property 
name="use_action_appearance">False</property>
+                                <property name="use_underline">True</property>
+                                <property name="xalign">0</property>
+                                <property name="active">True</property>
+                                <property name="draw_indicator">True</property>
+                                <signal name="realize" 
handler="GNUNET_setup_transport_tcp_checkbutton_realize_cb" swapped="no"/>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="padding">5</property>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkCheckButton" 
id="GNUNET_setup_transport_udp_checkbutton">
+                                <property name="label" 
translatable="yes">_UDP</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property 
name="receives_default">False</property>
+                                <property 
name="use_action_appearance">False</property>
+                                <property name="use_underline">True</property>
+                                <property name="xalign">0</property>
+                                <property name="draw_indicator">True</property>
+                                <signal name="realize" 
handler="GNUNET_setup_transport_udp_checkbutton_realize_cb" swapped="no"/>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="padding">5</property>
+                                <property name="position">2</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkCheckButton" 
id="GNUNET_setup_transport_http_checkbutton">
+                                <property name="label" 
translatable="yes">_HTTP</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property 
name="receives_default">False</property>
+                                <property 
name="use_action_appearance">False</property>
+                                <property name="use_underline">True</property>
+                                <property name="xalign">0</property>
+                                <property name="active">True</property>
+                                <property name="draw_indicator">True</property>
+                                <signal name="realize" 
handler="GNUNET_setup_transport_http_checkbutton_realize_cb" swapped="no"/>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="padding">5</property>
+                                <property name="position">3</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkCheckButton" 
id="GNUNET_setup_transport_https_checkbutton">
+                                <property name="label" 
translatable="yes">HTTP_S</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property 
name="receives_default">False</property>
+                                <property 
name="use_action_appearance">False</property>
+                                <property name="use_underline">True</property>
+                                <property name="xalign">0</property>
+                                <property name="active">True</property>
+                                <property name="draw_indicator">True</property>
+                                <signal name="realize" 
handler="GNUNET_setup_transport_https_checkbutton_realize_cb" swapped="no"/>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="padding">5</property>
+                                <property name="position">4</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkCheckButton" 
id="GNUNET_setup_transport_dv_checkbutton">
+                                <property name="label" 
translatable="yes">D_V</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property 
name="receives_default">False</property>
+                                <property 
name="use_action_appearance">False</property>
+                                <property name="use_underline">True</property>
+                                <property name="xalign">0</property>
+                                <property name="draw_indicator">True</property>
+                                <signal name="realize" 
handler="GNUNET_setup_transport_dv_checkbutton_realize_cb" swapped="no"/>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="padding">5</property>
+                                <property name="position">5</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkCheckButton" 
id="GNUNET_setup_transport_wlan_checkbutton">
+                                <property name="label" 
translatable="yes">_WLAN</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property 
name="receives_default">False</property>
+                                <property 
name="use_action_appearance">False</property>
+                                <property name="use_underline">True</property>
+                                <property name="xalign">0</property>
+                                <property name="draw_indicator">True</property>
+                                <signal name="realize" 
handler="GNUNET_setup_transport_wlan_checkbutton_realize_cb" swapped="no"/>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="padding">5</property>
+                                <property name="position">6</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkNotebook" 
id="GNUNET_setup_transport_notebook">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <child>
+                              <object class="GtkVBox" 
id="GNUNET_setup_transport_tcp_vbox">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="spacing">5</property>
+                                <child>
+                                  <object class="GtkHBox" 
id="GNUNET_setup_transport_tcp_port_hbox">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <child>
+                                      <object class="GtkLabel" 
id="GNUNET_setup_transport_tcp_port_label">
+                                        <property 
name="visible">True</property>
+                                        <property 
name="can_focus">False</property>
+                                        <property name="label" 
translatable="yes">Bind to port:</property>
+                                      </object>
+                                      <packing>
+                                        <property 
name="expand">False</property>
+                                        <property name="fill">False</property>
+                                        <property name="padding">5</property>
+                                        <property name="position">0</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkSpinButton" 
id="GNUNET_setup_transport_tcp_port_spinbutton">
+                                        <property 
name="visible">True</property>
+                                        <property 
name="can_focus">True</property>
+                                        <property 
name="max_length">5</property>
+                                        <property 
name="invisible_char">•</property>
+                                        <property 
name="invisible_char_set">True</property>
+                                        <property 
name="adjustment">GNUNET_setup_transport_tcp_port_adjustment</property>
+                                        <property 
name="numeric">True</property>
+                                      </object>
+                                      <packing>
+                                        <property 
name="expand">False</property>
+                                        <property name="fill">False</property>
+                                        <property name="padding">5</property>
+                                        <property name="position">1</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkLabel" 
id="GNUNET_setup_transport_tcp_port_detail_label">
+                                        <property 
name="visible">True</property>
+                                        <property 
name="can_focus">False</property>
+                                        <property name="label" 
translatable="yes">Use Port "0" to only allow outgoing TCP 
connections</property>
+                                      </object>
+                                      <packing>
+                                        <property 
name="expand">False</property>
+                                        <property name="fill">False</property>
+                                        <property name="padding">10</property>
+                                        <property name="position">2</property>
+                                      </packing>
+                                    </child>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                    <property name="padding">5</property>
+                                    <property name="position">0</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkHBox" 
id="GNUNET_setup_transport_tcp_adv_port_hbox">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <child>
+                                      <object class="GtkLabel" 
id="GNUNET_setup_transport_tcp_adv_port_label">
+                                        <property 
name="visible">True</property>
+                                        <property 
name="can_focus">False</property>
+                                        <property name="label" 
translatable="yes">Advertised port:</property>
+                                      </object>
+                                      <packing>
+                                        <property 
name="expand">False</property>
+                                        <property name="fill">False</property>
+                                        <property name="padding">5</property>
+                                        <property name="position">0</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkSpinButton" 
id="GNUNET_setup_transport_tcp_adv_port_spinbutton">
+                                        <property 
name="visible">True</property>
+                                        <property 
name="can_focus">True</property>
+                                        <property 
name="max_length">5</property>
+                                        <property 
name="invisible_char">●</property>
+                                        <property 
name="invisible_char_set">True</property>
+                                        <property 
name="adjustment">GNUNET_setup_transport_tcp_adv_port_adjustment</property>
+                                        <property 
name="numeric">True</property>
+                                      </object>
+                                      <packing>
+                                        <property 
name="expand">False</property>
+                                        <property name="fill">False</property>
+                                        <property name="padding">5</property>
+                                        <property name="position">1</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkLabel" 
id="GNUNET_setup_transport_tcp_adv_detail_label">
+                                        <property 
name="visible">True</property>
+                                        <property 
name="can_focus">False</property>
+                                        <property name="label" 
translatable="yes">External port visible on our public IP address after 
mappings by NAT/firewalls</property>
+                                      </object>
+                                      <packing>
+                                        <property 
name="expand">False</property>
+                                        <property name="fill">False</property>
+                                        <property name="padding">10</property>
+                                        <property name="position">2</property>
+                                      </packing>
+                                    </child>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                    <property name="position">1</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkHBox" 
id="GNUNET_setup_transport_tcp_test_hbox">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <child>
+                                      <object class="GtkLabel" id="label3">
+                                        <property 
name="visible">True</property>
+                                        <property 
name="can_focus">False</property>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">True</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">0</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkButton" 
id="GNUNET_setup_transport_tcp_test_button">
+                                        <property name="label" 
translatable="yes">Test configuration</property>
+                                        <property 
name="visible">True</property>
+                                        <property 
name="can_focus">True</property>
+                                        <property 
name="receives_default">True</property>
+                                        <property 
name="use_action_appearance">False</property>
+                                        <signal name="clicked" 
handler="GNUNET_setup_transport_tcp_test_button_clicked_cb" swapped="no"/>
+                                      </object>
+                                      <packing>
+                                        <property 
name="expand">False</property>
+                                        <property name="fill">False</property>
+                                        <property name="padding">5</property>
+                                        <property name="position">1</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkImage" 
id="GNUNET_setup_transport_tcp_test_success_image">
+                                        <property 
name="can_focus">False</property>
+                                        <property name="tooltip_text" 
translatable="yes">Configuration works!</property>
+                                        <property 
name="pixbuf">gnunet-setup-oxygen-ok.png</property>
+                                      </object>
+                                      <packing>
+                                        <property 
name="expand">False</property>
+                                        <property name="fill">False</property>
+                                        <property name="padding">5</property>
+                                        <property name="position">2</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkImage" 
id="GNUNET_setup_transport_tcp_test_fail_image">
+                                        <property 
name="can_focus">False</property>
+                                        <property name="tooltip_text" 
translatable="yes">Test failed!</property>
+                                        <property 
name="pixbuf">gnunet-setup-oxygen-cancel.png</property>
+                                      </object>
+                                      <packing>
+                                        <property 
name="expand">False</property>
+                                        <property name="fill">False</property>
+                                        <property name="padding">5</property>
+                                        <property name="position">3</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkLabel" id="label5">
+                                        <property 
name="visible">True</property>
+                                        <property 
name="can_focus">False</property>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">True</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">4</property>
+                                      </packing>
+                                    </child>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                    <property name="padding">5</property>
+                                    <property name="position">2</property>
+                                  </packing>
+                                </child>
+                              </object>
+                            </child>
+                            <child type="tab">
+                              <object class="GtkLabel" 
id="GNUNET_setup_transport_tcp_label">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="label" 
translatable="yes">TCP</property>
+                              </object>
+                              <packing>
+                                <property name="tab_fill">False</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkVBox" 
id="GNUNET_setup_transport_udp_vbox">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <child>
+                                  <object class="GtkHBox" id="hbox5">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="spacing">5</property>
+                                    <child>
+                                      <object class="GtkLabel" 
id="GNUNET_setup_transport_udp_port_label">
+                                        <property 
name="visible">True</property>
+                                        <property 
name="can_focus">False</property>
+                                        <property name="tooltip_text" 
translatable="yes">Port number that GNUnet's UDP transport should bind to on 
the local system</property>
+                                        <property name="label" 
translatable="yes">Bind to port:</property>
+                                      </object>
+                                      <packing>
+                                        <property 
name="expand">False</property>
+                                        <property name="fill">False</property>
+                                        <property name="padding">5</property>
+                                        <property name="position">0</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkSpinButton" 
id="GNUNET_setup_transport_udp_port_spinbutton">
+                                        <property 
name="visible">True</property>
+                                        <property 
name="can_focus">True</property>
+                                        <property 
name="max_length">5</property>
+                                        <property 
name="invisible_char">•</property>
+                                        <property 
name="invisible_char_set">True</property>
+                                        <property 
name="adjustment">GNUNET_setup_transport_udp_port_adjustment</property>
+                                        <property 
name="numeric">True</property>
+                                      </object>
+                                      <packing>
+                                        <property 
name="expand">False</property>
+                                        <property name="fill">False</property>
+                                        <property name="padding">5</property>
+                                        <property name="position">1</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <placeholder/>
+                                    </child>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                    <property name="padding">5</property>
+                                    <property name="position">0</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkHBox" 
id="GNUNET_setup_transport_udp_advertised_hbox">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="spacing">5</property>
+                                    <child>
+                                      <object class="GtkLabel" 
id="GNUNET_setup_transport_udp_advertised_port_label">
+                                        <property 
name="visible">True</property>
+                                        <property 
name="can_focus">False</property>
+                                        <property name="label" 
translatable="yes">Advertised port:</property>
+                                      </object>
+                                      <packing>
+                                        <property 
name="expand">False</property>
+                                        <property name="fill">True</property>
+                                        <property name="padding">5</property>
+                                        <property name="position">0</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkSpinButton" 
id="GNUNET_setup_transport_udp_advertised_port_spinbutton">
+                                        <property 
name="visible">True</property>
+                                        <property 
name="can_focus">True</property>
+                                        <property 
name="invisible_char">●</property>
+                                        <property 
name="adjustment">GNUNET_setup_transport_udp_advertised_port_adjustment</property>
+                                        <property 
name="numeric">True</property>
+                                      </object>
+                                      <packing>
+                                        <property 
name="expand">False</property>
+                                        <property name="fill">True</property>
+                                        <property name="padding">5</property>
+                                        <property name="position">1</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkLabel" 
id="GNUNET_setup_transport_udp_adv_detail_label">
+                                        <property 
name="visible">True</property>
+                                        <property 
name="can_focus">False</property>
+                                        <property name="label" 
translatable="yes">External port visible on our public IP address after 
mappings by NAT/firewalls</property>
+                                      </object>
+                                      <packing>
+                                        <property 
name="expand">False</property>
+                                        <property name="fill">False</property>
+                                        <property name="padding">10</property>
+                                        <property name="position">2</property>
+                                      </packing>
+                                    </child>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                    <property name="padding">5</property>
+                                    <property name="position">1</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkHBox" 
id="GNUNET_setup_transport_udp_test_hbox">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <child>
+                                      <object class="GtkLabel" id="label1">
+                                        <property 
name="visible">True</property>
+                                        <property 
name="can_focus">False</property>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">True</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">0</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkButton" 
id="GNUNET_setup_transport_udp_test_button">
+                                        <property name="label" 
translatable="yes">Test configuration</property>
+                                        <property 
name="visible">True</property>
+                                        <property 
name="can_focus">True</property>
+                                        <property 
name="receives_default">True</property>
+                                        <property 
name="use_action_appearance">False</property>
+                                        <signal name="clicked" 
handler="GNUNET_setup_transport_udp_test_button_clicked_cb" swapped="no"/>
+                                      </object>
+                                      <packing>
+                                        <property 
name="expand">False</property>
+                                        <property name="fill">False</property>
+                                        <property name="padding">5</property>
+                                        <property name="position">1</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkImage" 
id="GNUNET_setup_transport_udp_test_success_image">
+                                        <property 
name="can_focus">False</property>
+                                        <property name="tooltip_text" 
translatable="yes">Configuration works!</property>
+                                        <property 
name="pixbuf">gnunet-setup-oxygen-ok.png</property>
+                                      </object>
+                                      <packing>
+                                        <property 
name="expand">False</property>
+                                        <property name="fill">False</property>
+                                        <property name="padding">5</property>
+                                        <property name="position">2</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkImage" 
id="GNUNET_setup_transport_udp_test_fail_image">
+                                        <property 
name="can_focus">False</property>
+                                        <property name="tooltip_text" 
translatable="yes">Test failed!</property>
+                                        <property 
name="pixbuf">gnunet-setup-oxygen-cancel.png</property>
+                                      </object>
+                                      <packing>
+                                        <property 
name="expand">False</property>
+                                        <property name="fill">False</property>
+                                        <property name="padding">5</property>
+                                        <property name="position">3</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkLabel" id="label2">
+                                        <property 
name="visible">True</property>
+                                        <property 
name="can_focus">False</property>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">True</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">4</property>
+                                      </packing>
+                                    </child>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                    <property name="padding">5</property>
+                                    <property name="position">2</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <placeholder/>
+                                </child>
+                              </object>
+                              <packing>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                            <child type="tab">
+                              <object class="GtkLabel" 
id="GNUNET_setup_transport_udp_label">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="label" 
translatable="yes">UDP</property>
+                              </object>
+                              <packing>
+                                <property name="position">1</property>
+                                <property name="tab_fill">False</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkVBox" 
id="GNUNET_setup_transport_http_vbox">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <child>
+                                  <object class="GtkHBox" 
id="GNUNET_setup_transport_http_port_hbox">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="spacing">5</property>
+                                    <child>
+                                      <object class="GtkLabel" 
id="GNUNET_setup_transport_http_port_label">
+                                        <property 
name="visible">True</property>
+                                        <property 
name="can_focus">False</property>
+                                        <property 
name="has_tooltip">True</property>
+                                        <property name="tooltip_markup" 
translatable="yes">Port number that GNUnet&amp;apos;s UDP transport should bind 
to on the local system</property>
+                                        <property name="tooltip_text" 
translatable="yes">Port number that GNUnet's UDP transport should bind to on 
the local system</property>
+                                        <property name="label" 
translatable="yes">Bind to port:</property>
+                                      </object>
+                                      <packing>
+                                        <property 
name="expand">False</property>
+                                        <property name="fill">False</property>
+                                        <property name="padding">5</property>
+                                        <property name="position">0</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkSpinButton" 
id="GNUNET_setup_transport_http_port_spinbutton">
+                                        <property 
name="visible">True</property>
+                                        <property 
name="can_focus">True</property>
+                                        <property 
name="max_length">5</property>
+                                        <property 
name="invisible_char">•</property>
+                                        <property 
name="invisible_char_set">True</property>
+                                        <property 
name="adjustment">GNUNET_setup_transport_http_port_adjustment</property>
+                                        <property 
name="numeric">True</property>
+                                      </object>
+                                      <packing>
+                                        <property 
name="expand">False</property>
+                                        <property name="fill">False</property>
+                                        <property name="padding">5</property>
+                                        <property name="position">1</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <placeholder/>
+                                    </child>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                    <property name="padding">5</property>
+                                    <property name="position">0</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkHBox" 
id="GNUNET_setup_transport_http_advertised_hbox">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="spacing">5</property>
+                                    <child>
+                                      <object class="GtkLabel" 
id="GNUNET_setup_transport_http_advertised_port_label">
+                                        <property 
name="visible">True</property>
+                                        <property 
name="can_focus">False</property>
+                                        <property name="label" 
translatable="yes">Advertised port:</property>
+                                      </object>
+                                      <packing>
+                                        <property 
name="expand">False</property>
+                                        <property name="fill">True</property>
+                                        <property name="padding">5</property>
+                                        <property name="position">0</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkSpinButton" 
id="GNUNET_setup_transport_http_advertised_port_spinbutton">
+                                        <property 
name="visible">True</property>
+                                        <property 
name="can_focus">True</property>
+                                        <property 
name="max_length">5</property>
+                                        <property 
name="invisible_char">●</property>
+                                        <property 
name="invisible_char_set">True</property>
+                                        <property 
name="adjustment">GNUNET_setup_transport_http_advertised_port_adjustment</property>
+                                        <property 
name="numeric">True</property>
+                                      </object>
+                                      <packing>
+                                        <property 
name="expand">False</property>
+                                        <property name="fill">True</property>
+                                        <property name="padding">5</property>
+                                        <property name="position">1</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkLabel" 
id="GNUNET_setup_transport_http_adv_detail_label">
+                                        <property 
name="visible">True</property>
+                                        <property 
name="can_focus">False</property>
+                                        <property name="label" 
translatable="yes">External port visible on our public IP address after 
mappings by NAT/firewalls</property>
+                                      </object>
+                                      <packing>
+                                        <property 
name="expand">False</property>
+                                        <property name="fill">False</property>
+                                        <property name="padding">10</property>
+                                        <property name="position">2</property>
+                                      </packing>
+                                    </child>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                    <property name="padding">5</property>
+                                    <property name="position">1</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkHBox" 
id="GNUNET_setup_transport_http_test_hbox">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <child>
+                                      <object class="GtkLabel" id="label4">
+                                        <property 
name="visible">True</property>
+                                        <property 
name="can_focus">False</property>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">True</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">0</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkButton" 
id="GNUNET_setup_transport_http_test_button">
+                                        <property name="label" 
translatable="yes">Test configuration</property>
+                                        <property 
name="visible">True</property>
+                                        <property 
name="can_focus">True</property>
+                                        <property 
name="receives_default">True</property>
+                                        <property 
name="use_action_appearance">False</property>
+                                        <signal name="clicked" 
handler="GNUNET_setup_transport_http_test_button_clicked_cb" swapped="no"/>
+                                      </object>
+                                      <packing>
+                                        <property 
name="expand">False</property>
+                                        <property name="fill">False</property>
+                                        <property name="padding">5</property>
+                                        <property name="position">1</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkImage" 
id="GNUNET_setup_transport_http_test_success_image">
+                                        <property 
name="can_focus">False</property>
+                                        <property name="tooltip_text" 
translatable="yes">Configuration works!</property>
+                                        <property 
name="pixbuf">gnunet-setup-oxygen-ok.png</property>
+                                      </object>
+                                      <packing>
+                                        <property 
name="expand">False</property>
+                                        <property name="fill">False</property>
+                                        <property name="padding">5</property>
+                                        <property name="position">2</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkImage" 
id="GNUNET_setup_transport_http_test_fail_image">
+                                        <property 
name="can_focus">False</property>
+                                        <property name="tooltip_text" 
translatable="yes">Test failed!</property>
+                                        <property 
name="pixbuf">gnunet-setup-oxygen-cancel.png</property>
+                                      </object>
+                                      <packing>
+                                        <property 
name="expand">False</property>
+                                        <property name="fill">False</property>
+                                        <property name="padding">5</property>
+                                        <property name="position">3</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkLabel" id="label6">
+                                        <property 
name="visible">True</property>
+                                        <property 
name="can_focus">False</property>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">True</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">4</property>
+                                      </packing>
+                                    </child>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                    <property name="padding">5</property>
+                                    <property name="position">2</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <placeholder/>
+                                </child>
+                              </object>
+                              <packing>
+                                <property name="position">2</property>
+                              </packing>
+                            </child>
+                            <child type="tab">
+                              <object class="GtkLabel" 
id="GNUNET_setup_transport_http_label">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="label" 
translatable="yes">HTTP</property>
+                              </object>
+                              <packing>
+                                <property name="position">2</property>
+                                <property name="tab_fill">False</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkVBox" 
id="GNUNET_setup_transport_https_vbox">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <child>
+                                  <object class="GtkHBox" 
id="GNUNET_setup_transport_https_port_hbox">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="spacing">5</property>
+                                    <child>
+                                      <object class="GtkLabel" 
id="GNUNET_setup_transport_https_port_label">
+                                        <property 
name="visible">True</property>
+                                        <property 
name="can_focus">False</property>
+                                        <property 
name="has_tooltip">True</property>
+                                        <property name="tooltip_markup" 
translatable="yes">Port number that GNUnet&amp;apos;s UDP transport should bind 
to on the local system</property>
+                                        <property name="tooltip_text" 
translatable="yes">Port number that GNUnet's UDP transport should bind to on 
the local system</property>
+                                        <property name="label" 
translatable="yes">Bind to port:</property>
+                                      </object>
+                                      <packing>
+                                        <property 
name="expand">False</property>
+                                        <property name="fill">False</property>
+                                        <property name="padding">5</property>
+                                        <property name="position">0</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkSpinButton" 
id="GNUNET_setup_transport_https_port_spinbutton">
+                                        <property 
name="visible">True</property>
+                                        <property 
name="can_focus">True</property>
+                                        <property 
name="max_length">5</property>
+                                        <property 
name="invisible_char">•</property>
+                                        <property 
name="invisible_char_set">True</property>
+                                        <property 
name="adjustment">GNUNET_setup_transport_https_port_adjustment</property>
+                                        <property 
name="numeric">True</property>
+                                      </object>
+                                      <packing>
+                                        <property 
name="expand">False</property>
+                                        <property name="fill">False</property>
+                                        <property name="padding">5</property>
+                                        <property name="position">1</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <placeholder/>
+                                    </child>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                    <property name="padding">5</property>
+                                    <property name="position">0</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkHBox" 
id="GNUNET_setup_transport_https_advertised_hbox">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="spacing">5</property>
+                                    <child>
+                                      <object class="GtkLabel" 
id="GNUNET_setup_transport_https_advertised_port_label">
+                                        <property 
name="visible">True</property>
+                                        <property 
name="can_focus">False</property>
+                                        <property name="label" 
translatable="yes">Advertised port:</property>
+                                      </object>
+                                      <packing>
+                                        <property 
name="expand">False</property>
+                                        <property name="fill">True</property>
+                                        <property name="padding">5</property>
+                                        <property name="position">0</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkSpinButton" 
id="GNUNET_setup_transport_https_advertised_port_spinbutton">
+                                        <property 
name="visible">True</property>
+                                        <property 
name="can_focus">True</property>
+                                        <property 
name="max_length">5</property>
+                                        <property 
name="invisible_char">●</property>
+                                        <property 
name="invisible_char_set">True</property>
+                                        <property 
name="adjustment">GNUNET_setup_transport_https_advertised_port_adjustment</property>
+                                        <property 
name="numeric">True</property>
+                                      </object>
+                                      <packing>
+                                        <property 
name="expand">False</property>
+                                        <property name="fill">True</property>
+                                        <property name="padding">5</property>
+                                        <property name="position">1</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkLabel" 
id="GNUNET_setup_transport_https_adv_detail_label">
+                                        <property 
name="visible">True</property>
+                                        <property 
name="can_focus">False</property>
+                                        <property name="label" 
translatable="yes">External port visible on our public IP address after 
mappings by NAT/firewalls</property>
+                                      </object>
+                                      <packing>
+                                        <property 
name="expand">False</property>
+                                        <property name="fill">False</property>
+                                        <property name="padding">10</property>
+                                        <property name="position">2</property>
+                                      </packing>
+                                    </child>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                    <property name="padding">5</property>
+                                    <property name="position">1</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkHBox" 
id="GNUNET_setup_transport_https_test_hbox">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <child>
+                                      <object class="GtkLabel" id="label7">
+                                        <property 
name="visible">True</property>
+                                        <property 
name="can_focus">False</property>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">True</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">0</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkButton" 
id="GNUNET_setup_transport_https_test_button">
+                                        <property name="label" 
translatable="yes">Test configuration</property>
+                                        <property 
name="visible">True</property>
+                                        <property 
name="can_focus">True</property>
+                                        <property 
name="receives_default">True</property>
+                                        <property 
name="use_action_appearance">False</property>
+                                        <signal name="clicked" 
handler="GNUNET_setup_transport_https_test_button_clicked_cb" swapped="no"/>
+                                      </object>
+                                      <packing>
+                                        <property 
name="expand">False</property>
+                                        <property name="fill">False</property>
+                                        <property name="padding">5</property>
+                                        <property name="position">1</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkImage" 
id="GNUNET_setup_transport_https_test_success_image">
+                                        <property 
name="can_focus">False</property>
+                                        <property name="tooltip_text" 
translatable="yes">Configuration works!</property>
+                                        <property 
name="pixbuf">gnunet-setup-oxygen-ok.png</property>
+                                      </object>
+                                      <packing>
+                                        <property 
name="expand">False</property>
+                                        <property name="fill">False</property>
+                                        <property name="padding">5</property>
+                                        <property name="position">2</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkImage" 
id="GNUNET_setup_transport_https_test_fail_image">
+                                        <property 
name="can_focus">False</property>
+                                        <property name="tooltip_text" 
translatable="yes">Test failed!</property>
+                                        <property 
name="pixbuf">gnunet-setup-oxygen-cancel.png</property>
+                                      </object>
+                                      <packing>
+                                        <property 
name="expand">False</property>
+                                        <property name="fill">False</property>
+                                        <property name="padding">5</property>
+                                        <property name="position">3</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkLabel" id="label8">
+                                        <property 
name="visible">True</property>
+                                        <property 
name="can_focus">False</property>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">True</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">4</property>
+                                      </packing>
+                                    </child>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                    <property name="padding">5</property>
+                                    <property name="position">2</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <placeholder/>
+                                </child>
+                              </object>
+                              <packing>
+                                <property name="position">3</property>
+                              </packing>
+                            </child>
+                            <child type="tab">
+                              <object class="GtkLabel" 
id="GNUNET_setup_transport_https_label">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="label" 
translatable="yes">HTTPS</property>
+                              </object>
+                              <packing>
+                                <property name="position">3</property>
+                                <property name="tab_fill">False</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkVBox" 
id="GNUNET_setup_transport_dv_vbox">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <child>
+                                  <placeholder/>
+                                </child>
+                              </object>
+                              <packing>
+                                <property name="position">4</property>
+                              </packing>
+                            </child>
+                            <child type="tab">
+                              <object class="GtkLabel" 
id="GNUNET_setup_transport_dv_label">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="label" 
translatable="yes">DV</property>
+                              </object>
+                              <packing>
+                                <property name="position">4</property>
+                                <property name="tab_fill">False</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkVBox" 
id="GNUNET_setup_transport_wlan_vbox">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <child>
+                                  <object class="GtkHBox" 
id="GNUNET_setup_transport_wlan_hbox">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <child>
+                                      <object class="GtkLabel" 
id="GNUNET_setup_transport_wlan_interface_label">
+                                        <property 
name="visible">True</property>
+                                        <property 
name="can_focus">False</property>
+                                        <property name="label" 
translatable="yes">Name of _Monitor Interface</property>
+                                        <property 
name="use_underline">True</property>
+                                      </object>
+                                      <packing>
+                                        <property 
name="expand">False</property>
+                                        <property name="fill">False</property>
+                                        <property name="padding">5</property>
+                                        <property name="position">0</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkEntry" 
id="GNUNET_setup_transport_wlan_interface_entry">
+                                        <property 
name="visible">True</property>
+                                        <property 
name="can_focus">True</property>
+                                        <property 
name="max_length">255</property>
+                                        <property 
name="invisible_char">●</property>
+                                        <property 
name="invisible_char_set">True</property>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">True</property>
+                                        <property name="fill">True</property>
+                                        <property name="padding">5</property>
+                                        <property name="position">1</property>
+                                      </packing>
+                                    </child>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">True</property>
+                                    <property name="padding">5</property>
+                                    <property name="position">0</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <placeholder/>
+                                </child>
+                              </object>
+                              <packing>
+                                <property name="position">5</property>
+                              </packing>
+                            </child>
+                            <child type="tab">
+                              <object class="GtkLabel" 
id="GNUNET_setup_transport_wlan_label">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="label" 
translatable="yes">WLAN</property>
+                              </object>
+                              <packing>
+                                <property name="position">5</property>
+                                <property name="tab_fill">False</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="expand">True</property>
+                            <property name="fill">True</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                      </object>
+                    </child>
+                  </object>
+                </child>
+                <child type="label">
+                  <object class="GtkLabel" 
id="GNUNET_setup_transport_notebook_label">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="label" 
translatable="yes">&lt;b&gt;Transport Configuration&lt;/b&gt;</property>
+                    <property name="use_markup">True</property>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="position">2</property>
+              </packing>
+            </child>
+            <child type="tab">
+              <object class="GtkLabel" id="GNUNET_setup_transport_label">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" 
translatable="yes">_Transports</property>
+                <property name="use_underline">True</property>
+              </object>
+              <packing>
+                <property name="position">2</property>
+                <property name="tab_fill">False</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkVBox" id="GNUNET_setup_fs_main_vbox">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <child>
+                  <object class="GtkFrame" id="GNUNET_setup_fs_frame">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="label_xalign">0</property>
+                    <property name="shadow_type">none</property>
+                    <child>
+                      <object class="GtkAlignment" 
id="GNUNET_setup_fs_alignment">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="left_padding">12</property>
+                        <child>
+                          <object class="GtkHBox" 
id="GNUNET_setup_fs_migration_hbox">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <child>
+                              <object class="GtkCheckButton" 
id="GNUNET_setup_fs_migration_from_checkbutton">
+                                <property name="label" 
translatable="yes">Enable unsolicited content transmission from this 
peer</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property 
name="receives_default">False</property>
+                                <property 
name="use_action_appearance">False</property>
+                                <property name="xalign">0</property>
+                                <property name="active">True</property>
+                                <property name="draw_indicator">True</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="padding">5</property>
+                                <property name="position">0</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkCheckButton" 
id="GNUNET_setup_fs_migration_to_checkbutton">
+                                <property name="label" 
translatable="yes">Enable caching content at this peer</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property 
name="receives_default">False</property>
+                                <property 
name="use_action_appearance">False</property>
+                                <property name="xalign">0</property>
+                                <property name="active">True</property>
+                                <property name="draw_indicator">True</property>
+                              </object>
+                              <packing>
+                                <property name="expand">True</property>
+                                <property name="fill">True</property>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                          </object>
+                        </child>
+                      </object>
+                    </child>
+                    <child type="label">
+                      <object class="GtkLabel" 
id="GNUNET_setup_fs_options_label">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="label" 
translatable="yes">&lt;b&gt;File Sharing Options&lt;/b&gt;</property>
+                        <property name="use_markup">True</property>
+                      </object>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkFrame" id="GNUNET_setup_datastore_frame">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="label_xalign">0</property>
+                    <property name="shadow_type">none</property>
+                    <child>
+                      <object class="GtkAlignment" 
id="GNUNET_setup_datastore_alignment">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="left_padding">12</property>
+                        <child>
+                          <object class="GtkVBox" 
id="GNUNET_setup_datastore_vbox">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <child>
+                              <object class="GtkHBox" 
id="GNUNET_setup_datastore_hbox">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <child>
+                                  <object class="GtkLabel" 
id="GNUNET_setup_datastore_label">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="label" 
translatable="yes">Database Backend to use:</property>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                    <property name="padding">5</property>
+                                    <property name="position">0</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkHButtonBox" 
id="GNUNET_setup_datastore_hbuttonbox">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property 
name="layout_style">start</property>
+                                    <child>
+                                      <object class="GtkRadioButton" 
id="GNUNET_setup_fs_datastore_sqlite_radiobutton">
+                                        <property name="label" 
translatable="yes">sqLite</property>
+                                        <property 
name="visible">True</property>
+                                        <property 
name="can_focus">True</property>
+                                        <property 
name="receives_default">False</property>
+                                        <property 
name="use_action_appearance">False</property>
+                                        <property name="xalign">0</property>
+                                        <property name="active">True</property>
+                                        <property 
name="draw_indicator">True</property>
+                                        <signal name="realize" 
handler="GNUNET_setup_fs_datastore_sqlite_radiobutton_realize_cb" swapped="no"/>
+                                      </object>
+                                      <packing>
+                                        <property 
name="expand">False</property>
+                                        <property name="fill">False</property>
+                                        <property name="position">0</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkRadioButton" 
id="GNUNET_setup_fs_datastore_mysql_radiobutton">
+                                        <property name="label" 
translatable="yes">MySQL</property>
+                                        <property 
name="visible">True</property>
+                                        <property 
name="can_focus">True</property>
+                                        <property 
name="receives_default">False</property>
+                                        <property 
name="use_action_appearance">False</property>
+                                        <property name="xalign">0</property>
+                                        <property 
name="yalign">0.50999999046325684</property>
+                                        <property 
name="draw_indicator">True</property>
+                                        <property 
name="group">GNUNET_setup_fs_datastore_sqlite_radiobutton</property>
+                                        <signal name="realize" 
handler="GNUNET_setup_fs_datastore_mysql_radiobutton_realize_cb" swapped="no"/>
+                                      </object>
+                                      <packing>
+                                        <property 
name="expand">False</property>
+                                        <property name="fill">False</property>
+                                        <property name="position">1</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkRadioButton" 
id="GNUNET_setup_fs_datastore_postgres_radiobutton">
+                                        <property name="label" 
translatable="yes">Postgres</property>
+                                        <property 
name="visible">True</property>
+                                        <property 
name="can_focus">True</property>
+                                        <property 
name="receives_default">False</property>
+                                        <property 
name="use_action_appearance">False</property>
+                                        <property name="xalign">0</property>
+                                        <property 
name="draw_indicator">True</property>
+                                        <property 
name="group">GNUNET_setup_fs_datastore_sqlite_radiobutton</property>
+                                        <signal name="realize" 
handler="GNUNET_setup_fs_datastore_postgres_radiobutton_realize_cb" 
swapped="no"/>
+                                      </object>
+                                      <packing>
+                                        <property 
name="expand">False</property>
+                                        <property name="fill">False</property>
+                                        <property name="position">2</property>
+                                      </packing>
+                                    </child>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                    <property name="position">1</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkVSeparator" 
id="GNUNET_setup_datastore_vseparator">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">True</property>
+                                    <property name="padding">5</property>
+                                    <property name="position">2</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkLabel" 
id="GNUNET_setup_fs_datastore_quota_label">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="label" 
translatable="yes">Quota (bytes):</property>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                    <property name="padding">5</property>
+                                    <property name="position">3</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkSpinButton" 
id="GNUNET_setup_fs_datastore_quota_spinbutton">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property 
name="invisible_char">•</property>
+                                    <property 
name="invisible_char_set">True</property>
+                                    <property 
name="adjustment">GNUNET_setup_fs_datastore_quota_adjustment</property>
+                                    <property name="numeric">True</property>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                    <property name="position">4</property>
+                                  </packing>
+                                </child>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="position">0</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkNotebook" 
id="GNUNET_setup_fs_datastore_notebook">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <child>
+                                  <object class="GtkLabel" 
id="GNUNET_setup_fs_datastore_sqlite_label">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="label" 
translatable="yes">No setup required.</property>
+                                  </object>
+                                </child>
+                                <child type="tab">
+                                  <object class="GtkLabel" 
id="GNUNET_setup_datastore_sqlite_label">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="label" 
translatable="yes">sqLite</property>
+                                  </object>
+                                  <packing>
+                                    <property name="tab_fill">False</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkVBox" 
id="GNUNET_setup_datastore_mysql_vbox">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <child>
+                                      <object class="GtkHBox" id="hbox13">
+                                        <property 
name="visible">True</property>
+                                        <property 
name="can_focus">False</property>
+                                        <child>
+                                          <object class="GtkLabel" 
id="GNUNET_setup_datastore_mysql_database_name_label">
+                                            <property 
name="visible">True</property>
+                                            <property 
name="can_focus">False</property>
+                                            <property name="label" 
translatable="yes">MySQL database name:</property>
+                                          </object>
+                                          <packing>
+                                            <property 
name="expand">False</property>
+                                            <property 
name="fill">False</property>
+                                            <property 
name="padding">5</property>
+                                            <property 
name="position">0</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkEntry" 
id="GNUNET_setup_datastore_mysql_database_name_entry">
+                                            <property 
name="visible">True</property>
+                                            <property 
name="can_focus">True</property>
+                                            <property 
name="invisible_char">•</property>
+                                            <property name="text" 
translatable="yes">gnunet</property>
+                                            <property 
name="invisible_char_set">True</property>
+                                            <signal name="changed" 
handler="GNUNET_setup_datastore_mysql_invalidate_cb" swapped="no"/>
+                                          </object>
+                                          <packing>
+                                            <property 
name="expand">True</property>
+                                            <property 
name="fill">True</property>
+                                            <property 
name="padding">5</property>
+                                            <property 
name="position">1</property>
+                                          </packing>
+                                        </child>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">True</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">0</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkHBox" id="hbox14">
+                                        <property 
name="visible">True</property>
+                                        <property 
name="can_focus">False</property>
+                                        <child>
+                                          <object class="GtkLabel" 
id="GNUNET_setup_datastore_mysql_config_file_label">
+                                            <property 
name="visible">True</property>
+                                            <property 
name="can_focus">False</property>
+                                            <property name="label" 
translatable="yes">Configuration file:</property>
+                                          </object>
+                                          <packing>
+                                            <property 
name="expand">False</property>
+                                            <property 
name="fill">False</property>
+                                            <property 
name="position">0</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkFileChooserButton" 
id="GNUNET_setup_datastore_mysql_config_file_filechooserbutton">
+                                            <property 
name="visible">True</property>
+                                            <property 
name="can_focus">False</property>
+                                          </object>
+                                          <packing>
+                                            <property 
name="expand">True</property>
+                                            <property 
name="fill">True</property>
+                                            <property 
name="padding">5</property>
+                                            <property 
name="position">1</property>
+                                          </packing>
+                                        </child>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">True</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">1</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkHBox" id="hbox15">
+                                        <property 
name="visible">True</property>
+                                        <property 
name="can_focus">False</property>
+                                        <child>
+                                          <object class="GtkLabel" 
id="GNUNET_setup_datastore_mysql_username_label">
+                                            <property 
name="visible">True</property>
+                                            <property 
name="can_focus">False</property>
+                                            <property name="label" 
translatable="yes">Username:</property>
+                                          </object>
+                                          <packing>
+                                            <property 
name="expand">False</property>
+                                            <property 
name="fill">False</property>
+                                            <property 
name="padding">5</property>
+                                            <property 
name="position">0</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkEntry" 
id="GNUNET_setup_datastore_mysql_username_entry">
+                                            <property 
name="visible">True</property>
+                                            <property 
name="can_focus">True</property>
+                                            <property 
name="invisible_char">•</property>
+                                            <property 
name="invisible_char_set">True</property>
+                                          </object>
+                                          <packing>
+                                            <property 
name="expand">True</property>
+                                            <property 
name="fill">True</property>
+                                            <property 
name="padding">5</property>
+                                            <property 
name="position">1</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkLabel" 
id="GNUNET_setup_datastore_mysql_password_label">
+                                            <property 
name="visible">True</property>
+                                            <property 
name="can_focus">False</property>
+                                            <property name="label" 
translatable="yes">Password:</property>
+                                          </object>
+                                          <packing>
+                                            <property 
name="expand">False</property>
+                                            <property 
name="fill">False</property>
+                                            <property 
name="position">2</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkEntry" 
id="GNUNET_setup_datastore_mysql_password_entry">
+                                            <property 
name="visible">True</property>
+                                            <property 
name="can_focus">True</property>
+                                            <property 
name="invisible_char">•</property>
+                                            <property 
name="invisible_char_set">True</property>
+                                          </object>
+                                          <packing>
+                                            <property 
name="expand">True</property>
+                                            <property 
name="fill">True</property>
+                                            <property 
name="padding">5</property>
+                                            <property 
name="position">3</property>
+                                          </packing>
+                                        </child>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">True</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">2</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkHBox" id="hbox16">
+                                        <property 
name="visible">True</property>
+                                        <property 
name="can_focus">False</property>
+                                        <child>
+                                          <object class="GtkLabel" 
id="GNUNET_setup-datastore_mysql_hostname_label">
+                                            <property 
name="visible">True</property>
+                                            <property 
name="can_focus">False</property>
+                                            <property name="label" 
translatable="yes">MySQL Server Hostname:</property>
+                                          </object>
+                                          <packing>
+                                            <property 
name="expand">False</property>
+                                            <property 
name="fill">False</property>
+                                            <property 
name="padding">5</property>
+                                            <property 
name="position">0</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkEntry" 
id="GNUNET_setup_datastore_mysql_hostname_entry">
+                                            <property 
name="visible">True</property>
+                                            <property 
name="can_focus">True</property>
+                                            <property 
name="invisible_char">•</property>
+                                            <property name="text" 
translatable="yes">localhost</property>
+                                            <property 
name="invisible_char_set">True</property>
+                                          </object>
+                                          <packing>
+                                            <property 
name="expand">True</property>
+                                            <property 
name="fill">True</property>
+                                            <property 
name="padding">5</property>
+                                            <property 
name="position">1</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkLabel" 
id="GNUNET_setup_datastore_mysql_port_label">
+                                            <property 
name="visible">True</property>
+                                            <property 
name="can_focus">False</property>
+                                            <property name="label" 
translatable="yes">Port:</property>
+                                          </object>
+                                          <packing>
+                                            <property 
name="expand">False</property>
+                                            <property 
name="fill">False</property>
+                                            <property 
name="padding">5</property>
+                                            <property 
name="position">2</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkSpinButton" 
id="GNUNET_setup_datastore_mysql_port_spinbutton">
+                                            <property 
name="visible">True</property>
+                                            <property 
name="can_focus">True</property>
+                                            <property 
name="invisible_char">•</property>
+                                            <property 
name="invisible_char_set">True</property>
+                                            <property 
name="adjustment">GNUNET_setup_fs_datastore_mysql_port_adjustment</property>
+                                            <property 
name="numeric">True</property>
+                                            <signal name="value-changed" 
handler="GNUNET_setup_datastore_mysql_invalidate_cb" swapped="no"/>
+                                          </object>
+                                          <packing>
+                                            <property 
name="expand">False</property>
+                                            <property 
name="fill">False</property>
+                                            <property 
name="padding">5</property>
+                                            <property 
name="position">3</property>
+                                          </packing>
+                                        </child>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">True</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">3</property>
+                                      </packing>
+                                    </child>
+                                  </object>
+                                  <packing>
+                                    <property name="position">1</property>
+                                  </packing>
+                                </child>
+                                <child type="tab">
+                                  <object class="GtkHBox" 
id="GNUNET_setup_datastore_mysql_hbox">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <child>
+                                      <object class="GtkLabel" 
id="GNUNET_setup_datastore_mysql_tab_label">
+                                        <property 
name="visible">True</property>
+                                        <property 
name="can_focus">False</property>
+                                        <property name="label" 
translatable="yes">MySQL</property>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">True</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">0</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkButton" 
id="GNUNET_setup_datastore_mysql_tab_test_button">
+                                        <property 
name="visible">True</property>
+                                        <property 
name="can_focus">True</property>
+                                        <property 
name="receives_default">True</property>
+                                        <property 
name="use_action_appearance">False</property>
+                                        <property name="relief">none</property>
+                                        <signal name="clicked" 
handler="GNUNET_setup_datastore_mysql_tab_test_button_clicked_cb" swapped="no"/>
+                                        <child>
+                                          <object class="GtkImage" 
id="GNUNET_setup_datastore_mysql_tab_test_image">
+                                            <property 
name="visible">True</property>
+                                            <property 
name="can_focus">False</property>
+                                            <property name="tooltip_text" 
translatable="yes">Test datastore configuration</property>
+                                            <property 
name="pixbuf">gnunet-setup-oxygen-cancel.png</property>
+                                          </object>
+                                        </child>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">True</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">1</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkImage" 
id="GNUNET_setup_datastore_mysql_tab_ok_image">
+                                        <property 
name="can_focus">False</property>
+                                        <property name="tooltip_text" 
translatable="yes">Configuration works!</property>
+                                        <property 
name="pixbuf">gnunet-setup-oxygen-ok.png</property>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">True</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">2</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkImage" 
id="GNUNET_setup_datastore_mysql_tab_error_image">
+                                        <property 
name="can_focus">False</property>
+                                        <property name="tooltip_text" 
translatable="yes">Configuration error!</property>
+                                        <property 
name="pixbuf">gnunet-setup-oxygen-cancel.png</property>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">True</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">3</property>
+                                      </packing>
+                                    </child>
+                                  </object>
+                                  <packing>
+                                    <property name="position">1</property>
+                                    <property name="tab_fill">False</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkHBox" 
id="GNUNET_setup_datastore_postgres_hbox">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <child>
+                                      <object class="GtkLabel" 
id="GNUNET_setup_datastore_postgres_config_label">
+                                        <property 
name="visible">True</property>
+                                        <property 
name="can_focus">False</property>
+                                        <property name="label" 
translatable="yes">Configuration:</property>
+                                      </object>
+                                      <packing>
+                                        <property 
name="expand">False</property>
+                                        <property name="fill">True</property>
+                                        <property name="padding">5</property>
+                                        <property name="position">0</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkEntry" 
id="GNUNET_setup_datastore_postgres_config_entry">
+                                        <property 
name="visible">True</property>
+                                        <property 
name="can_focus">True</property>
+                                        <property 
name="invisible_char">•</property>
+                                        <property name="text" 
translatable="yes">connect_timeout=10; dbname=gnunet</property>
+                                        <property 
name="invisible_char_set">True</property>
+                                        <signal name="changed" 
handler="GNUNET_setup_datastore_postgres_invalidate_cb" swapped="no"/>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">True</property>
+                                        <property name="fill">True</property>
+                                        <property name="padding">5</property>
+                                        <property name="position">1</property>
+                                      </packing>
+                                    </child>
+                                  </object>
+                                  <packing>
+                                    <property name="position">2</property>
+                                  </packing>
+                                </child>
+                                <child type="tab">
+                                  <object class="GtkHBox" 
id="GNUNET_setup_datastore_postgres_hbox ">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <child>
+                                      <object class="GtkLabel" 
id="GNUNET_setup_datastore_postgres_tab_label">
+                                        <property 
name="visible">True</property>
+                                        <property 
name="can_focus">False</property>
+                                        <property name="label" 
translatable="yes">Postgres</property>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">True</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">0</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkButton" 
id="GNUNET_setup_datastore_postgres_tab_test_button">
+                                        <property 
name="visible">True</property>
+                                        <property 
name="can_focus">True</property>
+                                        <property 
name="receives_default">True</property>
+                                        <property 
name="use_action_appearance">False</property>
+                                        <property name="relief">none</property>
+                                        <signal name="clicked" 
handler="GNUNET_setup_datastore_postgres_tab_test_button_clicked_cb" 
swapped="no"/>
+                                        <child>
+                                          <object class="GtkImage" 
id="GNUNET_setup_datastore_postgres_tab_test_image">
+                                            <property 
name="visible">True</property>
+                                            <property 
name="can_focus">False</property>
+                                            <property name="tooltip_text" 
translatable="yes">Test datastore configuration</property>
+                                            <property 
name="stock">gtk-refresh</property>
+                                          </object>
+                                        </child>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">True</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">1</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkImage" 
id="GNUNET_setup_datastore_postgres_tab_ok_image">
+                                        <property 
name="can_focus">False</property>
+                                        <property name="tooltip_text" 
translatable="yes">Configuration works!</property>
+                                        <property 
name="pixbuf">gnunet-setup-oxygen-ok.png</property>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">True</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">2</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkImage" 
id="GNUNET_setup_datastore_postgres_tab_error_image">
+                                        <property 
name="can_focus">False</property>
+                                        <property name="tooltip_text" 
translatable="yes">Configuration error!</property>
+                                        <property 
name="pixbuf">gnunet-setup-oxygen-cancel.png</property>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">True</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">3</property>
+                                      </packing>
+                                    </child>
+                                  </object>
+                                  <packing>
+                                    <property name="position">2</property>
+                                    <property name="tab_fill">False</property>
+                                  </packing>
+                                </child>
+                              </object>
+                              <packing>
+                                <property name="expand">True</property>
+                                <property name="fill">True</property>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                          </object>
+                        </child>
+                      </object>
+                    </child>
+                    <child type="label">
+                      <object class="GtkLabel" 
id="GNUNET_setup_datastore_frame_label">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="label" 
translatable="yes">&lt;b&gt;Configure Datastore (persistent 
storage)&lt;/b&gt;</property>
+                        <property name="use_markup">True</property>
+                      </object>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkFrame" id="GNUNET_setup_datacache_frame">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="label_xalign">0</property>
+                    <property name="shadow_type">none</property>
+                    <child>
+                      <object class="GtkAlignment" 
id="GNUNET_setup_datacache_alignment">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="left_padding">12</property>
+                        <child>
+                          <object class="GtkVBox" 
id="GNUNET_setup_datacache_vbox">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <child>
+                              <object class="GtkHBox" 
id="GNUNET_setup_datacache_hbox">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <child>
+                                  <object class="GtkLabel" 
id="GNUNET_setup_datacache_label1">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="label" 
translatable="yes">Datacache:</property>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                    <property name="padding">5</property>
+                                    <property name="position">0</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkHButtonBox" 
id="GNUNET_setup_datacache_hbuttonbox">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property 
name="layout_style">start</property>
+                                    <child>
+                                      <object class="GtkRadioButton" 
id="GNUNET_setup_fs_datacache_sqlite_radiobutton">
+                                        <property name="label" 
translatable="yes">sqLite</property>
+                                        <property 
name="visible">True</property>
+                                        <property 
name="can_focus">True</property>
+                                        <property 
name="receives_default">False</property>
+                                        <property 
name="use_action_appearance">False</property>
+                                        <property name="xalign">0</property>
+                                        <property name="active">True</property>
+                                        <property 
name="draw_indicator">True</property>
+                                        <signal name="realize" 
handler="GNUNET_setup_fs_datacache_sqlite_radiobutton_realize_cb" swapped="no"/>
+                                      </object>
+                                      <packing>
+                                        <property 
name="expand">False</property>
+                                        <property name="fill">False</property>
+                                        <property name="position">0</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkRadioButton" 
id="GNUNET_setup_fs_datacache_mysql_radiobutton">
+                                        <property name="label" 
translatable="yes">MySQL</property>
+                                        <property 
name="visible">True</property>
+                                        <property 
name="can_focus">True</property>
+                                        <property 
name="receives_default">False</property>
+                                        <property 
name="use_action_appearance">False</property>
+                                        <property name="xalign">0</property>
+                                        <property 
name="yalign">0.50999999046325684</property>
+                                        <property 
name="draw_indicator">True</property>
+                                        <property 
name="group">GNUNET_setup_fs_datacache_sqlite_radiobutton</property>
+                                        <signal name="realize" 
handler="GNUNET_setup_fs_datacache_mysql_radiobutton_realize_cb" swapped="no"/>
+                                      </object>
+                                      <packing>
+                                        <property 
name="expand">False</property>
+                                        <property name="fill">False</property>
+                                        <property name="position">1</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkRadioButton" 
id="GNUNET_setup_fs_datacache_postgres_radiobutton">
+                                        <property name="label" 
translatable="yes">Postgres</property>
+                                        <property 
name="visible">True</property>
+                                        <property 
name="can_focus">True</property>
+                                        <property 
name="receives_default">False</property>
+                                        <property 
name="use_action_appearance">False</property>
+                                        <property name="xalign">0</property>
+                                        <property 
name="draw_indicator">True</property>
+                                        <property 
name="group">GNUNET_setup_fs_datacache_sqlite_radiobutton</property>
+                                        <signal name="realize" 
handler="GNUNET_setup_fs_datacache_postgres_radiobutton_realize_cb" 
swapped="no"/>
+                                      </object>
+                                      <packing>
+                                        <property 
name="expand">False</property>
+                                        <property name="fill">False</property>
+                                        <property name="position">2</property>
+                                      </packing>
+                                    </child>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                    <property name="position">1</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkVSeparator" 
id="GNUNET_setup_datacache_vseparator">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">True</property>
+                                    <property name="padding">5</property>
+                                    <property name="position">2</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkLabel" 
id="GNUNET_setup_fs_datacache_quota_label">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="label" 
translatable="yes">Quota (bytes):</property>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                    <property name="padding">5</property>
+                                    <property name="position">3</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkSpinButton" 
id="GNUNET_setup_fs_datacache_quota_spinbutton">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property 
name="invisible_char">•</property>
+                                    <property 
name="invisible_char_set">True</property>
+                                    <property 
name="adjustment">GNUNET_setup_fs_datacache_quota_adjustment</property>
+                                    <property name="numeric">True</property>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                    <property name="position">4</property>
+                                  </packing>
+                                </child>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="position">0</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkNotebook" 
id="GNUNET_setup_fs_datacache_notebook">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <child>
+                                  <object class="GtkLabel" 
id="GNUNET_setup_fs_datacache_sqlite_label">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="label" 
translatable="yes">No setup required.</property>
+                                  </object>
+                                </child>
+                                <child type="tab">
+                                  <object class="GtkLabel" id="label4c">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="label" 
translatable="yes">sqLite</property>
+                                  </object>
+                                  <packing>
+                                    <property name="tab_fill">False</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkVBox" 
id="GNUNET_setup_datacache_mysql_vbox">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <child>
+                                      <object class="GtkHBox" id="hbox13c">
+                                        <property 
name="visible">True</property>
+                                        <property 
name="can_focus">False</property>
+                                        <child>
+                                          <object class="GtkLabel" 
id="GNUNET_setup_datacache_mysql_database_name_label">
+                                            <property 
name="visible">True</property>
+                                            <property 
name="can_focus">False</property>
+                                            <property name="label" 
translatable="yes">MySQL database name:</property>
+                                          </object>
+                                          <packing>
+                                            <property 
name="expand">False</property>
+                                            <property 
name="fill">False</property>
+                                            <property 
name="padding">5</property>
+                                            <property 
name="position">0</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkEntry" 
id="GNUNET_setup_datacache_mysql_database_name_entry">
+                                            <property 
name="visible">True</property>
+                                            <property 
name="can_focus">True</property>
+                                            <property 
name="invisible_char">•</property>
+                                            <property name="text" 
translatable="yes">gnunet</property>
+                                            <property 
name="invisible_char_set">True</property>
+                                            <signal name="changed" 
handler="GNUNET_setup_datacache_mysql_invalidate_cb" swapped="no"/>
+                                          </object>
+                                          <packing>
+                                            <property 
name="expand">True</property>
+                                            <property 
name="fill">True</property>
+                                            <property 
name="padding">5</property>
+                                            <property 
name="position">1</property>
+                                          </packing>
+                                        </child>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">True</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">0</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkHBox" id="hbox14c">
+                                        <property 
name="visible">True</property>
+                                        <property 
name="can_focus">False</property>
+                                        <child>
+                                          <object class="GtkLabel" 
id="GNUNET_setup_datacache_mysql_config_file_label">
+                                            <property 
name="visible">True</property>
+                                            <property 
name="can_focus">False</property>
+                                            <property name="label" 
translatable="yes">Configuration file:</property>
+                                          </object>
+                                          <packing>
+                                            <property 
name="expand">False</property>
+                                            <property 
name="fill">False</property>
+                                            <property 
name="position">0</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkFileChooserButton" 
id="GNUNET_setup_datacache_mysql_config_file_filechooserbutton">
+                                            <property 
name="visible">True</property>
+                                            <property 
name="can_focus">False</property>
+                                            <signal name="file-set" 
handler="GNUNET_setup_datacache_mysql_invalidate_cb" swapped="no"/>
+                                          </object>
+                                          <packing>
+                                            <property 
name="expand">True</property>
+                                            <property 
name="fill">True</property>
+                                            <property 
name="padding">5</property>
+                                            <property 
name="position">1</property>
+                                          </packing>
+                                        </child>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">True</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">1</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkHBox" id="hbox15c">
+                                        <property 
name="visible">True</property>
+                                        <property 
name="can_focus">False</property>
+                                        <child>
+                                          <object class="GtkLabel" 
id="GNUNET_setup_datacache_mysql_username_label">
+                                            <property 
name="visible">True</property>
+                                            <property 
name="can_focus">False</property>
+                                            <property name="label" 
translatable="yes">Username:</property>
+                                          </object>
+                                          <packing>
+                                            <property 
name="expand">False</property>
+                                            <property 
name="fill">False</property>
+                                            <property 
name="padding">5</property>
+                                            <property 
name="position">0</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkEntry" 
id="GNUNET_setup_datacache_mysql_username_entry">
+                                            <property 
name="visible">True</property>
+                                            <property 
name="can_focus">True</property>
+                                            <property 
name="invisible_char">•</property>
+                                            <property 
name="invisible_char_set">True</property>
+                                            <signal name="changed" 
handler="GNUNET_setup_datacache_mysql_invalidate_cb" swapped="no"/>
+                                          </object>
+                                          <packing>
+                                            <property 
name="expand">True</property>
+                                            <property 
name="fill">True</property>
+                                            <property 
name="padding">5</property>
+                                            <property 
name="position">1</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkLabel" 
id="GNUNET_setup_datacache_mysql_password_label">
+                                            <property 
name="visible">True</property>
+                                            <property 
name="can_focus">False</property>
+                                            <property name="label" 
translatable="yes">Password:</property>
+                                          </object>
+                                          <packing>
+                                            <property 
name="expand">False</property>
+                                            <property 
name="fill">False</property>
+                                            <property 
name="position">2</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkEntry" 
id="GNUNET_setup_datacache_mysql_password_entry">
+                                            <property 
name="visible">True</property>
+                                            <property 
name="can_focus">True</property>
+                                            <property 
name="invisible_char">•</property>
+                                            <property 
name="invisible_char_set">True</property>
+                                            <signal name="changed" 
handler="GNUNET_setup_datacache_mysql_invalidate_cb" swapped="no"/>
+                                          </object>
+                                          <packing>
+                                            <property 
name="expand">True</property>
+                                            <property 
name="fill">True</property>
+                                            <property 
name="padding">5</property>
+                                            <property 
name="position">3</property>
+                                          </packing>
+                                        </child>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">True</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">2</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkHBox" id="hbox16c">
+                                        <property 
name="visible">True</property>
+                                        <property 
name="can_focus">False</property>
+                                        <child>
+                                          <object class="GtkLabel" 
id="GNUNET_setup-datacache_mysql_hostname_label">
+                                            <property 
name="visible">True</property>
+                                            <property 
name="can_focus">False</property>
+                                            <property name="label" 
translatable="yes">MySQL Server Hostname:</property>
+                                          </object>
+                                          <packing>
+                                            <property 
name="expand">False</property>
+                                            <property 
name="fill">False</property>
+                                            <property 
name="padding">5</property>
+                                            <property 
name="position">0</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkEntry" 
id="GNUNET_setup_datacache_mysql_hostname_entry">
+                                            <property 
name="visible">True</property>
+                                            <property 
name="can_focus">True</property>
+                                            <property 
name="invisible_char">•</property>
+                                            <property name="text" 
translatable="yes">localhost</property>
+                                            <property 
name="invisible_char_set">True</property>
+                                            <signal name="changed" 
handler="GNUNET_setup_datacache_mysql_invalidate_cb" swapped="no"/>
+                                          </object>
+                                          <packing>
+                                            <property 
name="expand">True</property>
+                                            <property 
name="fill">True</property>
+                                            <property 
name="padding">5</property>
+                                            <property 
name="position">1</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkLabel" 
id="GNUNET_setup_datacache_mysql_port_label">
+                                            <property 
name="visible">True</property>
+                                            <property 
name="can_focus">False</property>
+                                            <property name="label" 
translatable="yes">Port:</property>
+                                          </object>
+                                          <packing>
+                                            <property 
name="expand">False</property>
+                                            <property 
name="fill">False</property>
+                                            <property 
name="padding">5</property>
+                                            <property 
name="position">2</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkSpinButton" 
id="GNUNET_setup_datacache_mysql_port_spinbutton">
+                                            <property 
name="visible">True</property>
+                                            <property 
name="can_focus">True</property>
+                                            <property 
name="invisible_char">•</property>
+                                            <property 
name="invisible_char_set">True</property>
+                                            <property 
name="adjustment">GNUNET_setup_fs_datacache_mysql_port_adjustment</property>
+                                            <property 
name="numeric">True</property>
+                                            <signal name="value-changed" 
handler="GNUNET_setup_datacache_mysql_invalidate_cb" swapped="no"/>
+                                          </object>
+                                          <packing>
+                                            <property 
name="expand">False</property>
+                                            <property 
name="fill">False</property>
+                                            <property 
name="padding">5</property>
+                                            <property 
name="position">3</property>
+                                          </packing>
+                                        </child>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">True</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">3</property>
+                                      </packing>
+                                    </child>
+                                  </object>
+                                  <packing>
+                                    <property name="position">1</property>
+                                  </packing>
+                                </child>
+                                <child type="tab">
+                                  <object class="GtkHBox" id="hbox3a">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <child>
+                                      <object class="GtkLabel" 
id="GNUNET_setup_datacache_mysql_tab_label">
+                                        <property 
name="visible">True</property>
+                                        <property 
name="can_focus">False</property>
+                                        <property name="label" 
translatable="yes">MySQL</property>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">True</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">0</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkButton" 
id="GNUNET_setup_datacache_mysql_tab_test_button">
+                                        <property 
name="visible">True</property>
+                                        <property 
name="can_focus">True</property>
+                                        <property 
name="receives_default">True</property>
+                                        <property 
name="use_action_appearance">False</property>
+                                        <property name="relief">none</property>
+                                        <signal name="clicked" 
handler="GNUNET_setup_datacache_mysql_tab_test_button_clicked_cb" swapped="no"/>
+                                        <child>
+                                          <object class="GtkImage" 
id="GNUNET_setup_datacache_mysql_tab_test_image">
+                                            <property 
name="visible">True</property>
+                                            <property 
name="can_focus">False</property>
+                                            <property name="tooltip_text" 
translatable="yes">Test datacache configuration</property>
+                                            <property 
name="stock">gtk-refresh</property>
+                                          </object>
+                                        </child>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">True</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">1</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkImage" 
id="GNUNET_setup_datacache_mysql_tab_ok_image">
+                                        <property 
name="can_focus">False</property>
+                                        <property name="tooltip_text" 
translatable="yes">Configuration works!</property>
+                                        <property 
name="pixbuf">gnunet-setup-oxygen-ok.png</property>
+                                      </object>
+                                      <packing>
+                                        <property 
name="expand">False</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">2</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkImage" 
id="GNUNET_setup_datacache_mysql_tab_error_image">
+                                        <property 
name="can_focus">False</property>
+                                        <property name="tooltip_text" 
translatable="yes">Configuration error!</property>
+                                        <property 
name="pixbuf">gnunet-setup-oxygen-cancel.png</property>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">True</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">3</property>
+                                      </packing>
+                                    </child>
+                                  </object>
+                                  <packing>
+                                    <property name="position">1</property>
+                                    <property name="tab_fill">False</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkHBox" 
id="GNUNET_setup_datacache_postgres_hbox">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <child>
+                                      <object class="GtkLabel" 
id="GNUNET_setup_datacache_postgres_config_label">
+                                        <property 
name="visible">True</property>
+                                        <property 
name="can_focus">False</property>
+                                        <property name="label" 
translatable="yes">Configuration:</property>
+                                      </object>
+                                      <packing>
+                                        <property 
name="expand">False</property>
+                                        <property name="fill">True</property>
+                                        <property name="padding">5</property>
+                                        <property name="position">0</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkEntry" 
id="GNUNET_setup_datacache_postgres_config_entry">
+                                        <property 
name="visible">True</property>
+                                        <property 
name="can_focus">True</property>
+                                        <property 
name="invisible_char">•</property>
+                                        <property name="text" 
translatable="yes">connect_timeout=10; dbname=gnunet</property>
+                                        <property 
name="invisible_char_set">True</property>
+                                        <signal name="changed" 
handler="GNUNET_setup_datacache_postgres_invalidate_cb" swapped="no"/>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">True</property>
+                                        <property name="fill">True</property>
+                                        <property name="padding">5</property>
+                                        <property name="position">1</property>
+                                      </packing>
+                                    </child>
+                                  </object>
+                                  <packing>
+                                    <property name="position">2</property>
+                                    <property name="tab_fill">False</property>
+                                  </packing>
+                                </child>
+                                <child type="tab">
+                                  <object class="GtkHBox" id="hbox8a">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <child>
+                                      <object class="GtkLabel" 
id="GNUNET_setup_datacache_postgres_tab_label">
+                                        <property 
name="visible">True</property>
+                                        <property 
name="can_focus">False</property>
+                                        <property name="label" 
translatable="yes">Postgres</property>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">True</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">0</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkButton" 
id="GNUNET_setup_datacache_postgres_tab_test_button">
+                                        <property 
name="visible">True</property>
+                                        <property 
name="can_focus">True</property>
+                                        <property 
name="receives_default">True</property>
+                                        <property 
name="use_action_appearance">False</property>
+                                        <property name="relief">none</property>
+                                        <signal name="clicked" 
handler="GNUNET_setup_datacache_postgres_tab_test_button_clicked_cb" 
swapped="no"/>
+                                        <child>
+                                          <object class="GtkImage" 
id="GNUNET_setup_datacache_postgres_tab_test_image">
+                                            <property 
name="visible">True</property>
+                                            <property 
name="can_focus">False</property>
+                                            <property name="tooltip_text" 
translatable="yes">Test datacache configuration</property>
+                                            <property 
name="stock">gtk-refresh</property>
+                                          </object>
+                                        </child>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">True</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">1</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkImage" 
id="GNUNET_setup_datacache_postgres_tab_ok_image">
+                                        <property 
name="can_focus">False</property>
+                                        <property name="tooltip_text" 
translatable="yes">Configuration works!</property>
+                                        <property 
name="pixbuf">gnunet-setup-oxygen-ok.png</property>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">True</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">2</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkImage" 
id="GNUNET_setup_datacache_postgres_tab_error_image">
+                                        <property 
name="can_focus">False</property>
+                                        <property name="tooltip_text" 
translatable="yes">Configuration error!</property>
+                                        <property 
name="pixbuf">gnunet-setup-oxygen-cancel.png</property>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">True</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">3</property>
+                                      </packing>
+                                    </child>
+                                  </object>
+                                  <packing>
+                                    <property name="position">2</property>
+                                    <property name="tab_fill">False</property>
+                                  </packing>
+                                </child>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                          </object>
+                        </child>
+                      </object>
+                    </child>
+                    <child type="label">
+                      <object class="GtkLabel" 
id="GNUNET_setup_datacache_frame_label">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="label" 
translatable="yes">&lt;b&gt;Configure Datacache (temporary 
storage)&lt;/b&gt;</property>
+                        <property name="use_markup">True</property>
+                      </object>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
+                    <property name="position">2</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="position">3</property>
+              </packing>
+            </child>
+            <child type="tab">
+              <object class="GtkLabel" id="GNUNET_setup_fs_label">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">_File 
Sharing</property>
+                <property name="use_underline">True</property>
+              </object>
+              <packing>
+                <property name="position">3</property>
+                <property name="tab_fill">False</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkVBox" id="GNUNET_setup_vpn_vbox">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <child>
+                  <object class="GtkFrame" 
id="GNUNET_setup_vpn_master_interface_configuration_frame">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="label_xalign">0</property>
+                    <property name="shadow_type">none</property>
+                    <child>
+                      <object class="GtkAlignment" 
id="GNUNET_setup_vpn_master_interface_configuration_frame_alignment">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="left_padding">12</property>
+                        <child>
+                          <object class="GtkVBox" 
id="GNUNET_setup_vpn_master_vbox">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <child>
+                              <object class="GtkHBox" 
id="GNUNET_setup_vpn_master_interface_hbox">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <child>
+                                  <object class="GtkLabel" id="label18">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="label" 
translatable="yes">Master _interface name:</property>
+                                    <property 
name="use_underline">True</property>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">True</property>
+                                    <property name="padding">5</property>
+                                    <property name="position">0</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkEntry" 
id="GNUNET_setup_vpn_master_interface_entry">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property 
name="invisible_char">●</property>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">True</property>
+                                    <property name="position">1</property>
+                                  </packing>
+                                </child>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">0</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkHBox" 
id="GNUNET_setup_vpn_master_interface_v4_hbox">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <child>
+                                  <object class="GtkLabel" 
id="GNUNET_setup_vpn_master_interface_v4_label">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="label" 
translatable="yes">IPv4 address for Master interface:</property>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">True</property>
+                                    <property name="padding">5</property>
+                                    <property name="position">0</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkEntry" 
id="GNUNET_setup_vpn_master_interface_v4_ip_entry">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property 
name="invisible_char">●</property>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">True</property>
+                                    <property name="position">1</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkLabel" 
id="GNUNET_setup_vpn_master_interface_v4_slash_label">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="label" 
translatable="yes">/</property>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">True</property>
+                                    <property name="position">2</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkEntry" 
id="GNUNET_setup_vpn_master_interface_v4_mask_entry">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property 
name="invisible_char">●</property>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">True</property>
+                                    <property name="position">3</property>
+                                  </packing>
+                                </child>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkHBox" 
id="GNUNET_setup_vpn_master_interface_v6_hbox">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <child>
+                                  <object class="GtkLabel" 
id="GNUNET_setup_vpn_master_interface_v6_label">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="label" 
translatable="yes">IPv6 address for Master interface: </property>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">True</property>
+                                    <property name="padding">5</property>
+                                    <property name="position">0</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkEntry" 
id="GNUNET_setup_vpn_master_interface_v6_ip_entry">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property 
name="invisible_char">●</property>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">True</property>
+                                    <property name="position">1</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkLabel" 
id="GNUNET_setup_vpn_master_interface_v6_slash_label">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="label" 
translatable="yes">/</property>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">True</property>
+                                    <property name="position">2</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkSpinButton" 
id="GNUNET_setup_vpn_master_interface_v6_mask_spinbutton">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property 
name="invisible_char">●</property>
+                                    <property 
name="adjustment">GNUNET_vpn_master_interface_mask_adjustment</property>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">True</property>
+                                    <property name="position">3</property>
+                                  </packing>
+                                </child>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">2</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkHBox" 
id="GNUNET_setup_vpn_master_vdns_hbox">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <child>
+                                  <object class="GtkLabel" 
id="GNUNET_setup_vpn_master_vdns_label">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="label" 
translatable="yes">Virtual DNS Server:</property>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">True</property>
+                                    <property name="padding">5</property>
+                                    <property name="position">0</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkEntry" 
id="GNUNET_setup_vpn_master_vdns_server_entry">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property 
name="invisible_char">●</property>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">True</property>
+                                    <property name="position">1</property>
+                                  </packing>
+                                </child>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">3</property>
+                              </packing>
+                            </child>
+                          </object>
+                        </child>
+                      </object>
+                    </child>
+                    <child type="label">
+                      <object class="GtkLabel" 
id="GNUNET_setup_vpn_master_interface_configuration_frame_label">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="label" translatable="yes">&lt;b&gt;VPN 
Master Interface Configuration&lt;/b&gt;</property>
+                        <property name="use_markup">True</property>
+                      </object>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="padding">5</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkHBox" id="GNUNET_setup_vpn_master_hbox">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <child>
+                      <object class="GtkCheckButton" 
id="GNUNET_setup_vpn_enable_vpn_exit_checkbutton">
+                        <property name="label" translatable="yes">Enable VPN 
Exit</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">False</property>
+                        <property name="use_action_appearance">False</property>
+                        <property name="xalign">0</property>
+                        <property name="draw_indicator">True</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="padding">5</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkCheckButton" 
id="GNUNET_setup_vpn_enable_dns_exit_checkbutton">
+                        <property name="label" translatable="yes">Enable DNS 
Exit</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">False</property>
+                        <property name="use_action_appearance">False</property>
+                        <property name="xalign">0</property>
+                        <property name="draw_indicator">True</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkFrame" id="GNUNET_setup_vpn_exit_frame">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="label_xalign">0</property>
+                    <property name="shadow_type">none</property>
+                    <child>
+                      <object class="GtkAlignment" 
id="GNUNET_setup_vpn_exit_frame_alignment">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="left_padding">12</property>
+                        <child>
+                          <object class="GtkVBox" 
id="GNUNET_setup_vpn_exit_frame_vbox">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <child>
+                              <object class="GtkHBox" 
id="GNUNET_setup_vpn_exit_frame_hbox">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="spacing">5</property>
+                                <child>
+                                  <object class="GtkLabel" 
id="GNUNET_setup_vpn_exit_interface_name_label">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="label" 
translatable="yes">Exit interface name: </property>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">True</property>
+                                    <property name="padding">5</property>
+                                    <property name="position">0</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkEntry" 
id="GNUNET_setup_vpn_exit_interface_name_entry">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property 
name="invisible_char">●</property>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">True</property>
+                                    <property name="fill">True</property>
+                                    <property name="position">1</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkCheckButton" 
id="GNUNET_setup_vpn_exit_enable_udp_checkbutton">
+                                    <property name="label" 
translatable="yes">Enable UDP Exit</property>
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property 
name="receives_default">False</property>
+                                    <property 
name="use_action_appearance">False</property>
+                                    <property name="xalign">0</property>
+                                    <property 
name="draw_indicator">True</property>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">True</property>
+                                    <property name="position">2</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkCheckButton" 
id="GNUNET_setup_vpn_exit_enable_tcp_checkbutton">
+                                    <property name="label" 
translatable="yes">Enable TCP exit</property>
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property 
name="receives_default">False</property>
+                                    <property 
name="use_action_appearance">False</property>
+                                    <property name="xalign">0</property>
+                                    <property 
name="draw_indicator">True</property>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">True</property>
+                                    <property name="position">3</property>
+                                  </packing>
+                                </child>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="position">0</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkHBox" 
id="GNUNET_setup_vpn_exit_ipv4_address_hbox">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <child>
+                                  <object class="GtkLabel" 
id="GNUNET_setup_vpn_exit_ipv4_address_label">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="label" 
translatable="yes">IPv4 address for Exit interface: </property>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">True</property>
+                                    <property name="padding">5</property>
+                                    <property name="position">0</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkEntry" 
id="GNUNET_setup_vpn_exit_interface_v4_ip_entry">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property 
name="invisible_char">●</property>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">True</property>
+                                    <property name="position">1</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkLabel" 
id="GNUNET_setup_vpn_exit_ipv4_address_slash_label">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="label" 
translatable="yes">/</property>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">True</property>
+                                    <property name="position">2</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkEntry" 
id="GNUNET_setup_vpn_exit_interface_v4_mask_entry">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property 
name="invisible_char">●</property>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">True</property>
+                                    <property name="position">3</property>
+                                  </packing>
+                                </child>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkHBox" 
id="GNUNET_setup_vpn_exit_ipv6_address_hbox">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <child>
+                                  <object class="GtkLabel" 
id="GNUNET_setup_vpn_exit_ipv6_address_label">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="label" 
translatable="yes">IPv6 address for Exit interface: </property>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">True</property>
+                                    <property name="padding">5</property>
+                                    <property name="position">0</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkEntry" 
id="GNUNET_setup_vpn_exit_interface_v6_ip_entry">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property 
name="invisible_char">●</property>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">True</property>
+                                    <property name="position">1</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkLabel" 
id="GNUNET_setup_vpn_exit_ipv6_address_slash_label">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="label" 
translatable="yes">/</property>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">True</property>
+                                    <property name="position">2</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkSpinButton" 
id="GNUNET_setup_vpn_exit_interface_v6_mask_spinbutton">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property 
name="invisible_char">●</property>
+                                    <property 
name="adjustment">GNUNET_vpn_exit_interface_mask_adjustment</property>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">True</property>
+                                    <property name="position">3</property>
+                                  </packing>
+                                </child>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">2</property>
+                              </packing>
+                            </child>
+                          </object>
+                        </child>
+                      </object>
+                    </child>
+                    <child type="label">
+                      <object class="GtkLabel" 
id="GNUNET_setup_vpn_exit_frame_label">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="label" 
translatable="yes">&lt;b&gt;GNUnet VPN Exit Interface&lt;/b&gt;</property>
+                        <property name="use_markup">True</property>
+                      </object>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="padding">5</property>
+                    <property name="position">2</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkFrame" 
id="GNUNET_setup_vpn_service_configuration_frame">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="label_xalign">0</property>
+                    <property name="shadow_type">none</property>
+                    <child>
+                      <object class="GtkAlignment" 
id="GNUNET_setup_vpn_dns_service_configuration_frame_alignment">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="left_padding">12</property>
+                        <child>
+                          <object class="GtkScrolledWindow" 
id="GNUNET_setup_vpn_dns_service_scrolledwindow">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="hscrollbar_policy">never</property>
+                            <property name="shadow_type">in</property>
+                            <child>
+                              <object class="GtkViewport" 
id="GNUNET_setup_vpn_viewport">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <child>
+                                  <object class="GtkTreeView" 
id="GNUNET_setup_vpn_dns_service_treeview">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property 
name="model">vpn_dns_config_liststore</property>
+                                    <property name="search_column">0</property>
+                                    <child internal-child="selection">
+                                      <object class="GtkTreeSelection" 
id="treeview-selection2"/>
+                                    </child>
+                                    <child>
+                                      <object class="GtkTreeViewColumn" 
id="GNUNET_setup_vpn_dns_service_dnsname_treeviewcolumn">
+                                        <property 
name="sizing">autosize</property>
+                                        <property name="title" 
translatable="yes">DNS name</property>
+                                        <property 
name="clickable">True</property>
+                                        <property 
name="reorderable">True</property>
+                                        <property 
name="sort_indicator">True</property>
+                                        <property 
name="sort_column_id">0</property>
+                                        <child>
+                                          <object class="GtkCellRendererText" 
id="GNUNET_setup_vpn_dns_service_dnsname_cellrenderertext">
+                                            <property 
name="editable">True</property>
+                                          </object>
+                                          <attributes>
+                                            <attribute 
name="text">0</attribute>
+                                          </attributes>
+                                        </child>
+                                      </object>
+                                    </child>
+                                    <child>
+                                      <object class="GtkTreeViewColumn" 
id="GNUNET_setup_vpn_dns_service_tcpudp_treeviewcolumn">
+                                        <property 
name="sizing">autosize</property>
+                                        <property name="title" 
translatable="yes">Prot.</property>
+                                        <child>
+                                          <object class="GtkCellRendererText" 
id="GNUNET_setup_vpn_dns_service_tcpudp_cellrenderertext">
+                                            <property 
name="editable">True</property>
+                                          </object>
+                                          <attributes>
+                                            <attribute 
name="text">4</attribute>
+                                          </attributes>
+                                        </child>
+                                      </object>
+                                    </child>
+                                    <child>
+                                      <object class="GtkTreeViewColumn" 
id="GNUNET_setup_vpn_dns_service_sourceport_treeviewcolumn">
+                                        <property 
name="sizing">autosize</property>
+                                        <property name="title" 
translatable="yes">Source Port</property>
+                                        <child>
+                                          <object class="GtkCellRendererText" 
id="GNUNET_setup_vpn_dns_service_sourceport_cellrenderertext">
+                                            <property 
name="editable">True</property>
+                                          </object>
+                                          <attributes>
+                                            <attribute 
name="text">1</attribute>
+                                          </attributes>
+                                        </child>
+                                      </object>
+                                    </child>
+                                    <child>
+                                      <object class="GtkTreeViewColumn" 
id="GNUNET_setup_vpn_dns_service_destination_treeviewcolumn">
+                                        <property 
name="resizable">True</property>
+                                        <property name="title" 
translatable="yes">Destination</property>
+                                        <property 
name="reorderable">True</property>
+                                        <property 
name="sort_indicator">True</property>
+                                        <property 
name="sort_column_id">2</property>
+                                        <child>
+                                          <object class="GtkCellRendererText" 
id="GNUNET_setup_vpn_dns_service_targethostname_cellrenderertext">
+                                            <property 
name="editable">True</property>
+                                          </object>
+                                          <attributes>
+                                            <attribute 
name="text">3</attribute>
+                                          </attributes>
+                                        </child>
+                                        <child>
+                                          <object class="GtkCellRendererText" 
id="GNUNET_setup_vpn_dns_service_targetcolon_cellrenderertext">
+                                            <property name="text">:</property>
+                                          </object>
+                                        </child>
+                                        <child>
+                                          <object class="GtkCellRendererText" 
id="GNUNET_setup_vpn_dns_service_targetport_cellrenderertext">
+                                            <property 
name="editable">True</property>
+                                          </object>
+                                          <attributes>
+                                            <attribute 
name="text">2</attribute>
+                                          </attributes>
+                                        </child>
+                                      </object>
+                                    </child>
+                                  </object>
+                                </child>
+                              </object>
+                            </child>
+                          </object>
+                        </child>
+                      </object>
+                    </child>
+                    <child type="label">
+                      <object class="GtkLabel" 
id="GNUNET_setup_vpn_dns_service_configuration_frame_label">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="label" translatable="yes">&lt;b&gt;DNS 
Services Configuration&lt;/b&gt;</property>
+                        <property name="use_markup">True</property>
+                      </object>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
+                    <property name="padding">5</property>
+                    <property name="position">3</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="position">4</property>
+              </packing>
+            </child>
+            <child type="tab">
+              <object class="GtkLabel" id="GNUNET_setup_vpn_label">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">_VPN</property>
+                <property name="use_underline">True</property>
+              </object>
+              <packing>
+                <property name="position">4</property>
+                <property name="tab_fill">False</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkLinkButton" id="GNUNET_setup_help_text">
+            <property name="label" translatable="yes">Welcome to 
gnunet-setup.</property>
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="receives_default">True</property>
+            <property name="has_tooltip">True</property>
+            <property name="use_action_appearance">False</property>
+            <property name="relief">none</property>
+            <property name="uri">https://gnunet.org/gnunet-setup</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">2</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+    <action-widgets>
+      <action-widget response="-6">GNUNET_setup_cancel_button</action-widget>
+      <action-widget response="-5">GNUNET_setup_save_as_button</action-widget>
+      <action-widget response="-3">GNUNET_setup_save_button</action-widget>
+    </action-widgets>
+  </object>
+  <object class="GtkAdjustment" 
id="GNUNET_setup_fs_datacache_mysql_port_adjustment">
+    <property name="lower">1</property>
+    <property name="upper">65535</property>
+    <property name="value">3306</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
+  <object class="GtkAdjustment" 
id="GNUNET_setup_fs_datacache_quota_adjustment">
+    <property name="lower">65536</property>
+    <property name="upper">9999999999</property>
+    <property name="value">1024000</property>
+    <property name="step_increment">65536</property>
+    <property name="page_increment">1024000</property>
+  </object>
+  <object class="GtkAdjustment" 
id="GNUNET_setup_fs_datastore_mysql_port_adjustment">
+    <property name="lower">1</property>
+    <property name="upper">65535</property>
+    <property name="value">3306</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
+  <object class="GtkAdjustment" 
id="GNUNET_setup_fs_datastore_quota_adjustment">
+    <property name="lower">1000000</property>
+    <property name="upper">999999999999</property>
+    <property name="value">100000000</property>
+    <property name="step_increment">1000000</property>
+    <property name="page_increment">1000000000</property>
+  </object>
+  <object class="GtkAdjustment" 
id="GNUNET_setup_hostlist_server_port_adjustment">
+    <property name="lower">1</property>
+    <property name="upper">65535</property>
+    <property name="value">8080</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
+  <object class="GtkListStore" id="GNUNET_setup_hostlist_url_liststore">
+    <columns>
+      <!-- column-name url -->
+      <column type="gchararray"/>
+      <!-- column-name editable -->
+      <column type="gboolean"/>
+    </columns>
+  </object>
+  <object class="GtkAdjustment" id="GNUNET_setup_min_friends_adjustment">
+    <property name="upper">9999</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
+  <object class="GtkAdjustment" 
id="GNUNET_setup_transport_http_advertised_port_adjustment">
+    <property name="lower">1</property>
+    <property name="upper">65535</property>
+    <property name="value">1080</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
+  <object class="GtkAdjustment" 
id="GNUNET_setup_transport_http_port_adjustment">
+    <property name="lower">1</property>
+    <property name="upper">65535</property>
+    <property name="value">1080</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
+  <object class="GtkAdjustment" 
id="GNUNET_setup_transport_https_advertised_port_adjustment">
+    <property name="lower">1</property>
+    <property name="upper">65535</property>
+    <property name="value">443</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
+  <object class="GtkAdjustment" 
id="GNUNET_setup_transport_https_port_adjustment">
+    <property name="lower">1</property>
+    <property name="upper">65535</property>
+    <property name="value">443</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
+  <object class="GtkAdjustment" 
id="GNUNET_setup_transport_tcp_adv_port_adjustment">
+    <property name="lower">1</property>
+    <property name="upper">65535</property>
+    <property name="value">2086</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
+  <object class="GtkAdjustment" 
id="GNUNET_setup_transport_tcp_port_adjustment">
+    <property name="upper">65535</property>
+    <property name="value">2086</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
+  <object class="GtkAdjustment" 
id="GNUNET_setup_transport_udp_advertised_port_adjustment">
+    <property name="lower">1</property>
+    <property name="upper">65535</property>
+    <property name="value">2086</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
+  <object class="GtkAdjustment" 
id="GNUNET_setup_transport_udp_port_adjustment">
+    <property name="lower">1</property>
+    <property name="upper">65535</property>
+    <property name="value">2086</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
+  <object class="GtkAdjustment" id="GNUNET_vpn_exit_interface_mask_adjustment">
+    <property name="lower">1</property>
+    <property name="upper">127</property>
+    <property name="value">48</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
+  <object class="GtkAdjustment" 
id="GNUNET_vpn_master_interface_mask_adjustment">
+    <property name="lower">1</property>
+    <property name="upper">127</property>
+    <property name="value">48</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
+  <object class="GtkAdjustment" id="adjustment1">
+    <property name="upper">100</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+    <property name="page_size">10</property>
+  </object>
+  <object class="GtkAdjustment" id="adjustment2">
+    <property name="upper">100</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+    <property name="page_size">10</property>
+  </object>
+  <object class="GtkAdjustment" id="adjustment3">
+    <property name="upper">100</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+    <property name="page_size">10</property>
+  </object>
+  <object class="GtkAdjustment" id="adjustment4">
+    <property name="upper">100</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+    <property name="page_size">10</property>
+  </object>
+  <object class="GtkAdjustment" id="adjustment5">
+    <property name="upper">100</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+    <property name="page_size">10</property>
+  </object>
+  <object class="GtkAdjustment" id="adjustment6">
+    <property name="upper">100</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+    <property name="page_size">10</property>
+  </object>
+  <object class="GtkAdjustment" id="adjustment7">
+    <property name="upper">100</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+    <property name="page_size">10</property>
+  </object>
+  <object class="GtkAdjustment" id="adjustment8">
+    <property name="upper">100</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+    <property name="page_size">10</property>
+  </object>
+  <object class="GtkListStore" id="vpn_dns_config_liststore">
+    <columns>
+      <!-- column-name hostname -->
+      <column type="gchararray"/>
+      <!-- column-name sourceport -->
+      <column type="guint"/>
+      <!-- column-name targetport -->
+      <column type="guint"/>
+      <!-- column-name targethostname -->
+      <column type="gchararray"/>
+      <!-- column-name isudp -->
+      <column type="gchararray"/>
+    </columns>
+  </object>
+</interface>

Deleted: gnunet-gtk/contrib/main-window.glade
===================================================================
--- gnunet-gtk/contrib/main-window.glade        2011-08-15 14:17:12 UTC (rev 
16548)
+++ gnunet-gtk/contrib/main-window.glade        2011-08-15 14:20:33 UTC (rev 
16549)
@@ -1,538 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <requires lib="gtk+" version="2.20"/>
-  <!-- interface-naming-policy project-wide -->
-  <object class="GtkAdjustment" id="adjustment4">
-    <property name="upper">100</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
-    <property name="page_size">10</property>
-  </object>
-  <object class="GtkAdjustment" id="adjustment3">
-    <property name="upper">100</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
-    <property name="page_size">10</property>
-  </object>
-  <object class="GtkAdjustment" id="adjustment2">
-    <property name="upper">100</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
-    <property name="page_size">10</property>
-  </object>
-  <object class="GtkAdjustment" id="adjustment1">
-    <property name="upper">100</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
-    <property name="page_size">10</property>
-  </object>
-  <object class="GtkImage" id="image6">
-    <property name="visible">True</property>
-    <property name="stock">gtk-index</property>
-  </object>
-  <object class="GtkListStore" id="GNUNET_GTK_peer_info_list_store">
-    <columns>
-      <!-- column-name peer_identity -->
-      <column type="gchararray"/>
-      <!-- column-name number_of_known_addresses -->
-      <column type="guint"/>
-      <!-- column-name country_name -->
-      <column type="gchararray"/>
-      <!-- column-name country_flag -->
-      <column type="GdkPixbuf"/>
-      <!-- column-name bandwidth -->
-      <column type="guint64"/>
-    </columns>
-  </object>
-  <object class="GtkListStore" id="GNUNET_GTK_meta_data_list_store">
-    <columns>
-      <!-- column-name extractor_meta_type -->
-      <column type="guint"/>
-      <!-- column-name extractor_meta_format -->
-      <column type="guint"/>
-      <!-- column-name extractor_meta_type_string -->
-      <column type="gchararray"/>
-      <!-- column-name extracotr_meta_value -->
-      <column type="gchararray"/>
-    </columns>
-  </object>
-  <object class="GtkWindow" id="GNUNET_GTK_main_window">
-    <property name="title" translatable="yes">gnunet-gtk</property>
-    <property name="window_position">center</property>
-    <property name="default_width">700</property>
-    <property name="default_height">500</property>
-    <property name="icon_name">gnunet-gtk</property>
-    <signal name="delete-event" handler="GNUNET_GTK_quit_cb" after="yes" 
swapped="no"/>
-    <child>
-      <object class="GtkVBox" id="GNUNET_GTK_main_window_vbox">
-        <property name="visible">True</property>
-        <child>
-          <object class="GtkMenuBar" id="GNUNET_GTK_main_menu">
-            <property name="visible">True</property>
-            <child>
-              <object class="GtkMenuItem" 
id="GNUNET_GTK_main_menu_file_sharing">
-                <property name="visible">True</property>
-                <property name="use_action_appearance">False</property>
-                <property name="label" translatable="yes">_File 
sharing</property>
-                <property name="use_underline">True</property>
-                <child type="submenu">
-                  <object class="GtkMenu" 
id="GNUNET_GTK_main_menu_file_sharing_box">
-                    <property name="visible">True</property>
-                    <child>
-                      <object class="GtkImageMenuItem" 
id="GNUNET_GTK_main_menu_file_create_pseudonym">
-                        <property name="label" translatable="yes">_Create 
pseudonym</property>
-                        <property name="visible">True</property>
-                        <property name="tooltip_text" 
translatable="yes">Create a pseudonym for publishing content.  Note that you 
can also publish content anonymously (without using a pseudonym).</property>
-                        <property name="use_action_appearance">False</property>
-                        <property name="accel_path">&lt;gnunet-gtk&gt;/File 
sharing/Create pseudonym</property>
-                        <property name="use_underline">True</property>
-                        <property name="image">image3</property>
-                        <property name="use_stock">False</property>
-                        <accelerator key="n" signal="activate" 
modifiers="GDK_CONTROL_MASK"/>
-                        <signal name="activate" 
handler="GNUNET_GTK_main_menu_create_pseudonym_activate_cb" swapped="no"/>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkImageMenuItem" 
id="GNUNET_GTK_main_menu_file_advertise_pseudonym">
-                        <property name="label" translatable="yes">_Advertise 
Pseudonym</property>
-                        <property name="visible">True</property>
-                        <property name="use_action_appearance">False</property>
-                        <property name="use_underline">True</property>
-                        <property name="image">image6</property>
-                        <property name="use_stock">False</property>
-                        <signal name="activate" 
handler="GNUNET_GTK_main_menu_file_advertise_pseudonym_activate_cb" 
swapped="no"/>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkImageMenuItem" 
id="GNUNET_GTK_main_menu_file_publish">
-                        <property name="label" 
translatable="yes">_Publish</property>
-                        <property name="visible">True</property>
-                        <property name="tooltip_text" 
translatable="yes">Publish files or directories on GNUnet</property>
-                        <property name="use_action_appearance">False</property>
-                        <property name="accel_path">&lt;gnunet-gtk&gt;/File 
sharing/Publish</property>
-                        <property name="use_underline">True</property>
-                        <property name="image">image2</property>
-                        <property name="use_stock">False</property>
-                        <accelerator key="a" signal="activate" 
modifiers="GDK_CONTROL_MASK"/>
-                        <signal name="activate" 
handler="GNUNET_GTK_main_menu_file_publish_activate_cb" swapped="no"/>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkSeparatorMenuItem" 
id="GNUNET_GTK_main_menu_file_sep1">
-                        <property name="visible">True</property>
-                        <property name="use_action_appearance">False</property>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkImageMenuItem" 
id="GNUNET_GTK_main_menu_file_search">
-                        <property name="label" 
translatable="yes">_Search</property>
-                        <property name="visible">True</property>
-                        <property name="tooltip_text" 
translatable="yes">Search GNUnet for files</property>
-                        <property name="use_action_appearance">False</property>
-                        <property name="accel_path">&lt;gnunet-gtk&gt;/File 
sharing/Search</property>
-                        <property name="use_underline">True</property>
-                        <property name="image">image4</property>
-                        <property name="use_stock">False</property>
-                        <accelerator key="s" signal="activate" 
modifiers="GDK_CONTROL_MASK"/>
-                        <signal name="activate" 
handler="GNUNET_GTK_main_menu_file_search_activate_cb" swapped="no"/>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkSeparatorMenuItem" 
id="GNUNET_GTK_main_menu_file_sep2">
-                        <property name="visible">True</property>
-                        <property name="use_action_appearance">False</property>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkImageMenuItem" 
id="GNUNET_GTK_main_menu_file_download_uri">
-                        <property name="label" 
translatable="yes">_Download</property>
-                        <property name="visible">True</property>
-                        <property name="tooltip_text" 
translatable="yes">Download a file or directory with a known URI.</property>
-                        <property name="use_action_appearance">False</property>
-                        <property name="accel_path">&lt;gnunet-gtk&gt;/File 
sharing/Download</property>
-                        <property name="use_underline">True</property>
-                        <property name="image">image5</property>
-                        <property name="use_stock">False</property>
-                        <accelerator key="d" signal="activate" 
modifiers="GDK_CONTROL_MASK"/>
-                        <signal name="activate" 
handler="GNUNET_GTK_main_menu_file_download_uri_activate_cb" swapped="no"/>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkImageMenuItem" 
id="GNUNET_GTK_main_menu_file_open_gnunet_directory">
-                        <property name="label" translatable="yes">_Open GNUnet 
directory</property>
-                        <property name="visible">True</property>
-                        <property name="tooltip_text" translatable="yes">Use 
this option to browse a GNUnet directory file that has been previously 
downloaded.</property>
-                        <property name="use_action_appearance">False</property>
-                        <property name="accel_path">&lt;gnunet-gtk&gt;/File 
sharing/Open directory</property>
-                        <property name="use_underline">True</property>
-                        <property name="image">image1</property>
-                        <property name="use_stock">False</property>
-                        <accelerator key="F3" signal="activate"/>
-                        <signal name="activate" 
handler="GNUNET_GTK_main_menu_file_open_gnunet_directory_activate_cb" 
swapped="no"/>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkSeparatorMenuItem" 
id="GNUNET_GTK_main_menu_file_sep3">
-                        <property name="visible">True</property>
-                        <property name="use_action_appearance">False</property>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkImageMenuItem" 
id="GNUNET_GTK_main_menu_file_quit">
-                        <property name="label">gtk-quit</property>
-                        <property name="visible">True</property>
-                        <property name="tooltip_text" translatable="yes">Exit 
gnunet-gtk.  Active file-sharing operations will resume upon restart.</property>
-                        <property name="use_action_appearance">False</property>
-                        <property 
name="accel_path">&lt;gnunet-gtk&gt;/Quit</property>
-                        <property name="use_underline">True</property>
-                        <property name="use_stock">True</property>
-                        <accelerator key="q" signal="activate" 
modifiers="GDK_CONTROL_MASK"/>
-                        <signal name="activate" handler="GNUNET_GTK_quit_cb" 
swapped="no"/>
-                      </object>
-                    </child>
-                  </object>
-                </child>
-              </object>
-            </child>
-            <child>
-              <object class="GtkMenuItem" id="GNUNET_GTK_main_menu_edit">
-                <property name="use_action_appearance">False</property>
-                <property name="label" translatable="yes">_Edit</property>
-                <property name="use_underline">True</property>
-                <child type="submenu">
-                  <object class="GtkMenu" id="GNUNET_GTK_main_menu_edit_box">
-                    <property name="visible">True</property>
-                    <child>
-                      <object class="GtkImageMenuItem" 
id="GNUNET_GTK_main_menu_edit_preferences">
-                        <property name="label">gtk-preferences</property>
-                        <property name="visible">True</property>
-                        <property name="tooltip_text" translatable="yes">Edit 
the system configuration.</property>
-                        <property name="use_action_appearance">False</property>
-                        <property 
name="accel_path">&lt;gnunet-gtk&gt;/Edit/Preferences</property>
-                        <property name="use_underline">True</property>
-                        <property name="use_stock">True</property>
-                      </object>
-                    </child>
-                  </object>
-                </child>
-              </object>
-            </child>
-            <child>
-              <object class="GtkMenuItem" id="GNUNET_GTK_main_menu_view">
-                <property name="visible">True</property>
-                <property name="use_action_appearance">False</property>
-                <property name="label" translatable="yes">_View</property>
-                <property name="use_underline">True</property>
-                <child type="submenu">
-                  <object class="GtkMenu" id="GNUNET_GTK_main_menu_view_box">
-                    <property name="visible">True</property>
-                    <child>
-                      <object class="GtkCheckMenuItem" 
id="GNUNET_GTK_main_menu_view_metadata">
-                        <property name="visible">True</property>
-                        <property name="tooltip_text" translatable="yes">Show 
meta data in main window</property>
-                        <property name="use_action_appearance">False</property>
-                        <property name="label" 
translatable="yes">Metadata</property>
-                        <property name="use_underline">True</property>
-                        <property name="active">True</property>
-                        <signal name="toggled" 
handler="GNUNET_GTK_main_menu_view_metadata_toggled_cb" swapped="no"/>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkCheckMenuItem" 
id="GNUNET_GTK_main_menu_view_neighbours">
-                        <property name="visible">True</property>
-                        <property name="tooltip_text" 
translatable="yes">Activates the panel showing information about known and 
connected peers</property>
-                        <property name="use_action_appearance">False</property>
-                        <property name="label" 
translatable="yes">Neighbours</property>
-                        <property name="use_underline">True</property>
-                        <property name="active">True</property>
-                        <signal name="toggled" 
handler="GNUNET_GTK_main_menu_view_neighbours_toggled_cb" swapped="no"/>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkCheckMenuItem" 
id="GNUNET_GTK_main_menu_view_preview">
-                        <property name="visible">True</property>
-                        <property name="tooltip_text" translatable="yes">Show 
preview (when available)</property>
-                        <property name="use_action_appearance">False</property>
-                        <property name="label" 
translatable="yes">Preview</property>
-                        <property name="use_underline">True</property>
-                        <property name="active">True</property>
-                        <signal name="toggled" 
handler="GNUNET_GTK_main_menu_view_preview_toggled_cb" swapped="no"/>
-                      </object>
-                    </child>
-                  </object>
-                </child>
-              </object>
-            </child>
-            <child>
-              <object class="GtkMenuItem" id="GNUNET_GTK_main_menu_help">
-                <property name="visible">True</property>
-                <property name="use_action_appearance">False</property>
-                <property name="label" translatable="yes">_Help</property>
-                <property name="use_underline">True</property>
-                <child type="submenu">
-                  <object class="GtkMenu" id="GNUNET_GTK_main_menu_help_abou">
-                    <property name="visible">True</property>
-                    <child>
-                      <object class="GtkImageMenuItem" 
id="GNUNET_GTK_main_menu_help_about">
-                        <property name="label">gtk-about</property>
-                        <property name="visible">True</property>
-                        <property name="tooltip_text" 
translatable="yes">Display information about this version of 
gnunet-gtk</property>
-                        <property name="use_action_appearance">False</property>
-                        <property 
name="accel_path">&lt;gnunet-gtk&gt;/Help/About</property>
-                        <property name="use_underline">True</property>
-                        <property name="use_stock">True</property>
-                        <signal name="activate" 
handler="GNUNET_GTK_main_menu_help_about_activate_cb" swapped="no"/>
-                      </object>
-                    </child>
-                  </object>
-                </child>
-              </object>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkToolbar" id="GNUNET_GTK_main_window_toolbar">
-            <property name="toolbar_style">icons</property>
-            <child>
-              <object class="GtkToolButton" id="GNUNET_GTK_toolbar_search">
-                <property name="visible">True</property>
-                <property name="use_action_appearance">False</property>
-                <property name="label" translatable="yes">_Search</property>
-                <property name="use_underline">True</property>
-                <property name="stock_id">gtk-find</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="homogeneous">True</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">False</property>
-            <property name="position">2</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkHBox" id="GNUNET_GTK_main_window_hbox">
-            <property name="visible">True</property>
-            <child>
-              <object class="GtkNotebook" id="GNUNET_GTK_main_window_notebook">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="scrollable">True</property>
-                <signal name="switch-page" 
handler="GNUNET_GTK_main_window_notebook_switch_page_cb" after="yes" 
swapped="no"/>
-              </object>
-              <packing>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkVSeparator" 
id="GNUNET_GTK_main_window_separator">
-                <property name="visible">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkVBox" id="GNUNET_GTK_main_window_extras_vbox">
-                <property name="visible">True</property>
-                <child>
-                  <object class="GtkImage" 
id="GNUNET_GTK_main_window_preview_image">
-                    <property name="width_request">128</property>
-                    <property name="height_request">128</property>
-                    <property name="visible">True</property>
-                    <property name="sensitive">False</property>
-                    <property name="has_tooltip">True</property>
-                    <property name="tooltip_text" translatable="yes">Thumbnail 
associated with the currently selected content</property>
-                    <property name="pixel_size">256</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkScrolledWindow" 
id="GNUNET_GTK_main_window_metadata_scroll">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="hadjustment">adjustment1</property>
-                    <property name="vadjustment">adjustment2</property>
-                    <property name="hscrollbar_policy">automatic</property>
-                    <property name="vscrollbar_policy">automatic</property>
-                    <child>
-                      <object class="GtkTreeView" 
id="GNUNET_GTK_main_window_metadata_treeview">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property 
name="model">GNUNET_GTK_meta_data_list_store</property>
-                        <property name="hadjustment">adjustment1</property>
-                        <property name="vadjustment">adjustment2</property>
-                        <property name="search_column">0</property>
-                        <property name="enable_grid_lines">both</property>
-                        <child>
-                          <object class="GtkTreeViewColumn" 
id="GNUNET_GTK_main_window_metadata_type_column">
-                            <property name="sizing">autosize</property>
-                            <property name="title" 
translatable="yes">Type</property>
-                            <property name="clickable">True</property>
-                            <property name="reorderable">True</property>
-                            <property name="sort_indicator">True</property>
-                            <child>
-                              <object class="GtkCellRendererText" 
id="GNUNET_GTK_main_window_metadata_type_renderer"/>
-                              <attributes>
-                                <attribute name="text">2</attribute>
-                              </attributes>
-                            </child>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkTreeViewColumn" 
id="GNUNET_GTK_main_window_metadata_value_column">
-                            <property name="sizing">autosize</property>
-                            <property name="title" 
translatable="yes">Value</property>
-                            <property name="expand">True</property>
-                            <property name="clickable">True</property>
-                            <property name="reorderable">True</property>
-                            <property name="sort_indicator">True</property>
-                            <child>
-                              <object class="GtkCellRendererText" 
id="GNUNET_GTK_main_window_metadata_value_renderer">
-                                <property name="sensitive">False</property>
-                                <property name="wrap_mode">word</property>
-                              </object>
-                              <attributes>
-                                <attribute name="text">3</attribute>
-                              </attributes>
-                            </child>
-                          </object>
-                        </child>
-                      </object>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkScrolledWindow" 
id="GNUNET_GTK_main_window_peerinfo_scroll">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="hadjustment">adjustment3</property>
-                    <property name="vadjustment">adjustment4</property>
-                    <property name="hscrollbar_policy">automatic</property>
-                    <property name="vscrollbar_policy">automatic</property>
-                    <child>
-                      <object class="GtkTreeView" 
id="GNUNET_GTK_main_window_peerinfo_treeview">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property 
name="model">GNUNET_GTK_peer_info_list_store</property>
-                        <property name="hadjustment">adjustment3</property>
-                        <property name="vadjustment">adjustment4</property>
-                        <property name="headers_clickable">False</property>
-                        <property name="reorderable">True</property>
-                        <property name="search_column">0</property>
-                        <child>
-                          <object class="GtkTreeViewColumn" 
id="GNUNET_GTK_main_window_peerinfo_name_column">
-                            <property name="sizing">autosize</property>
-                            <property name="title" 
translatable="yes">Peer</property>
-                            <property name="expand">True</property>
-                            <property name="clickable">True</property>
-                            <property name="reorderable">True</property>
-                            <property name="sort_column_id">0</property>
-                            <child>
-                              <object class="GtkCellRendererText" 
id="GNUNET_GTK_main_window_peerinfo_name_renderer">
-                                <property name="sensitive">False</property>
-                                <property name="width_chars">16</property>
-                              </object>
-                              <attributes>
-                                <attribute name="text">0</attribute>
-                              </attributes>
-                            </child>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkTreeViewColumn" 
id="GNUNET_GTK_main_window_peerinfo_bandwidth_column">
-                            <property name="sizing">autosize</property>
-                            <property name="title" 
translatable="yes">Bandwidth</property>
-                            <property name="sort_order">descending</property>
-                            <property name="sort_column_id">5</property>
-                            <child>
-                              <object class="GtkCellRendererText" 
id="GNUNET_GTK_main_window_peerinfo_bandwidth_renderer"/>
-                              <attributes>
-                                <attribute name="text">4</attribute>
-                              </attributes>
-                            </child>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkTreeViewColumn" 
id="GNUNET_GTK_main_window_peerinfo_country_column">
-                            <property name="sizing">autosize</property>
-                            <property name="title" 
translatable="yes">Country</property>
-                            <property name="clickable">True</property>
-                            <property name="reorderable">True</property>
-                            <property name="sort_indicator">True</property>
-                            <property name="sort_column_id">3</property>
-                            <child>
-                              <object class="GtkCellRendererPixbuf" 
id="GNUNET_GTK_main_window_peerinfo_country_renderer"/>
-                              <attributes>
-                                <attribute name="pixbuf">3</attribute>
-                              </attributes>
-                            </child>
-                          </object>
-                        </child>
-                      </object>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="position">2</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="position">2</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="position">3</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkStatusbar" id="GNUNET_GTK_status_bar">
-            <property name="visible">True</property>
-            <property name="spacing">2</property>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="pack_type">end</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-  </object>
-  <object class="GtkImage" id="image2">
-    <property name="visible">True</property>
-    <property name="stock">gtk-go-up</property>
-  </object>
-  <object class="GtkImage" id="image3">
-    <property name="visible">True</property>
-    <property name="stock">gtk-new</property>
-  </object>
-  <object class="GtkImage" id="image1">
-    <property name="visible">True</property>
-    <property name="stock">gtk-open</property>
-  </object>
-  <object class="GtkImage" id="image4">
-    <property name="visible">True</property>
-    <property name="stock">gtk-find</property>
-  </object>
-  <object class="GtkImage" id="image5">
-    <property name="visible">True</property>
-    <property name="stock">gtk-go-down</property>
-  </object>
-</interface>

Deleted: gnunet-gtk/contrib/main_tab_new_frame.glade
===================================================================
--- gnunet-gtk/contrib/main_tab_new_frame.glade 2011-08-15 14:17:12 UTC (rev 
16548)
+++ gnunet-gtk/contrib/main_tab_new_frame.glade 2011-08-15 14:20:33 UTC (rev 
16549)
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <requires lib="gtk+" version="2.20"/>
-  <!-- interface-naming-policy project-wide -->
-  <object class="GtkWindow" id="_main_tab_new_frame">
-    <child>
-      <object class="GtkButton" id="_main_tab_new_frame_new_button">
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <property name="receives_default">True</property>
-        <property name="use_action_appearance">False</property>
-        <child>
-          <object class="GtkImage" id="new_stock_icon_image">
-            <property name="visible">True</property>
-            <property name="stock">gtk-new</property>
-            <property name="icon-size">2</property>
-          </object>
-        </child>
-      </object>
-    </child>
-  </object>
-</interface>

Deleted: gnunet-gtk/contrib/open_directory_dialog.glade
===================================================================
--- gnunet-gtk/contrib/open_directory_dialog.glade      2011-08-15 14:17:12 UTC 
(rev 16548)
+++ gnunet-gtk/contrib/open_directory_dialog.glade      2011-08-15 14:20:33 UTC 
(rev 16549)
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <requires lib="gtk+" version="2.20"/>
-  <!-- interface-naming-policy project-wide -->
-  <object class="GtkFileFilter" id="gnunet_directory_filter"/>
-  <object class="GtkFileChooserDialog" id="GNUNET_GTK_open_directory_dialog">
-    <property name="can_default">True</property>
-    <property name="border_width">5</property>
-    <property name="type_hint">normal</property>
-    <property name="has_separator">False</property>
-    <property name="filter">gnunet_directory_filter</property>
-    <property name="create_folders">False</property>
-    <child internal-child="vbox">
-      <object class="GtkVBox" id="dialog-vbox3">
-        <property name="visible">True</property>
-        <property name="spacing">2</property>
-        <child>
-          <placeholder/>
-        </child>
-        <child internal-child="action_area">
-          <object class="GtkHButtonBox" id="dialog-action_area4">
-            <property name="visible">True</property>
-            <property name="layout_style">end</property>
-            <child>
-              <object class="GtkButton" 
id="GNUNET_GTK_open_directory_dialog_cancel_button">
-                <property name="label">gtk-cancel</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
-                <property name="use_stock">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkButton" 
id="GNUNET_GTK_open_directory_dialog_ok_button">
-                <property name="label">gtk-ok</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="can_default">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
-                <property name="use_stock">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="pack_type">end</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-    <action-widgets>
-      <action-widget 
response="0">GNUNET_GTK_open_directory_dialog_cancel_button</action-widget>
-      <action-widget 
response="-5">GNUNET_GTK_open_directory_dialog_ok_button</action-widget>
-    </action-widgets>
-  </object>
-</interface>

Deleted: gnunet-gtk/contrib/open_url_dialog.glade
===================================================================
--- gnunet-gtk/contrib/open_url_dialog.glade    2011-08-15 14:17:12 UTC (rev 
16548)
+++ gnunet-gtk/contrib/open_url_dialog.glade    2011-08-15 14:20:33 UTC (rev 
16549)
@@ -1,153 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <requires lib="gtk+" version="2.20"/>
-  <!-- interface-naming-policy project-wide -->
-  <object class="GtkImage" id="execute_stock_image">
-    <property name="visible">True</property>
-    <property name="stock">gtk-execute</property>
-  </object>
-  <object class="GtkAdjustment" id="GNUNET_GTK_open_url_anonymity_adjustment">
-    <property name="upper">100000</property>
-    <property name="value">1</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
-  </object>
-  <object class="GtkDialog" id="GNUNET_GTK_open_url_dialog">
-    <property name="width_request">500</property>
-    <property name="height_request">100</property>
-    <property name="border_width">5</property>
-    <property name="title" translatable="yes">Download from URI</property>
-    <property name="modal">True</property>
-    <property name="destroy_with_parent">True</property>
-    <property name="icon_name">dialog-password</property>
-    <property name="type_hint">dialog</property>
-    <property name="skip_taskbar_hint">True</property>
-    <property name="skip_pager_hint">True</property>
-    <property name="has_separator">False</property>
-    <child internal-child="vbox">
-      <object class="GtkVBox" id="GNUNET_GTK_open_url_dialog_main_vbox">
-        <property name="visible">True</property>
-        <property name="spacing">2</property>
-        <child>
-          <object class="GtkHBox" id="GNUNET_GTK_open_url_dialog_query_hbox">
-            <property name="visible">True</property>
-            <child>
-              <object class="GtkLabel" 
id="GNUNET_GTK_open_url_dialog_url_label">
-                <property name="visible">True</property>
-                <property name="label" translatable="yes">_URI:</property>
-                <property name="use_underline">True</property>
-                <property name="selectable">True</property>
-                <property 
name="mnemonic_widget">GNUNET_GTK_open_url_dialog_url_entry</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkEntry" 
id="GNUNET_GTK_open_url_dialog_url_entry">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="invisible_char">●</property>
-                <property name="activates_default">True</property>
-                <property name="caps_lock_warning">False</property>
-                <property 
name="primary_icon_stock">gtk-dialog-authentication</property>
-                <property name="primary_icon_tooltip_text" 
translatable="yes">Separate multiple keywords with spaces, prefix mandatory 
keywords with "+"</property>
-                <signal name="changed" 
handler="GNUNET_GTK_open_url_dialog_url_entry_changed_cb" swapped="no"/>
-                <signal name="activate" 
handler="GNUNET_GTK_search_dialog_search_button_clicked_cb" swapped="no"/>
-              </object>
-              <packing>
-                <property name="position">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel" 
id="GNUNET_GTK_open_url_dialog_anonymity_label">
-                <property name="visible">True</property>
-                <property name="label" 
translatable="yes">_Anonymity:</property>
-                <property name="use_underline">True</property>
-                <property name="selectable">True</property>
-                <property 
name="mnemonic_widget">GNUNET_GTK_open_url_dialog_anonymity_spin_button</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">2</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkSpinButton" 
id="GNUNET_GTK_open_url_dialog_anonymity_spin_button">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="invisible_char">●</property>
-                <property name="caps_lock_warning">False</property>
-                <property 
name="adjustment">GNUNET_GTK_open_url_anonymity_adjustment</property>
-                <property name="climb_rate">1</property>
-                <property name="numeric">True</property>
-                <signal name="value-changed" 
handler="GNUNET_GTK_anonymity_spin_button_value_changed_cb" swapped="no"/>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">3</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">False</property>
-            <property name="padding">5</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child internal-child="action_area">
-          <object class="GtkHButtonBox" 
id="GNUNET_GTK_open_url_dialog_action_area">
-            <property name="visible">True</property>
-            <property name="layout_style">end</property>
-            <child>
-              <object class="GtkButton" 
id="GNUNET_GTK_open_url_dialog_cancel_button">
-                <property name="label">gtk-cancel</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
-                <property name="use_stock">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkButton" 
id="GNUNET_GTK_open_url_dialog_execute_button">
-                <property name="label">_Execute</property>
-                <property name="visible">True</property>
-                <property name="sensitive">False</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
-                <property name="image">execute_stock_image</property>
-                <property name="use_underline">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="pack_type">end</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-    <action-widgets>
-      <action-widget 
response="-6">GNUNET_GTK_open_url_dialog_cancel_button</action-widget>
-      <action-widget 
response="-5">GNUNET_GTK_open_url_dialog_execute_button</action-widget>
-    </action-widgets>
-  </object>
-</interface>

Deleted: gnunet-gtk/contrib/publish-directory-dialog.glade
===================================================================
--- gnunet-gtk/contrib/publish-directory-dialog.glade   2011-08-15 14:17:12 UTC 
(rev 16548)
+++ gnunet-gtk/contrib/publish-directory-dialog.glade   2011-08-15 14:20:33 UTC 
(rev 16549)
@@ -1,215 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <requires lib="gtk+" version="2.20"/>
-  <!-- interface-naming-policy project-wide -->
-  <object class="GtkAdjustment" id="expiration_year_adjustment">
-    <property name="upper">9999</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
-  </object>
-  <object class="GtkAdjustment" id="priority_adjustment">
-    <property name="upper">100000000</property>
-    <property name="value">1000</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
-  </object>
-  <object class="GtkListStore" 
id="GNUNET_GTK_publish_directory_dialog_expiration_list_store">
-    <columns>
-      <!-- column-name human_readable_time -->
-      <column type="gchararray"/>
-      <!-- column-name time_in_ms -->
-      <column type="guint64"/>
-    </columns>
-  </object>
-  <object class="GtkFileChooserDialog" 
id="GNUNET_GTK_publish_directory_dialog">
-    <property name="can_default">True</property>
-    <property name="border_width">5</property>
-    <property name="type_hint">normal</property>
-    <property name="has_separator">False</property>
-    <property name="action">select-folder</property>
-    <property name="select_multiple">True</property>
-    <property name="create_folders">False</property>
-    <child internal-child="vbox">
-      <object class="GtkVBox" id="dialog-vbox2">
-        <property name="visible">True</property>
-        <property name="spacing">2</property>
-        <child>
-          <object class="GtkVBox" id="vbox1">
-            <property name="visible">True</property>
-            <child>
-              <object class="GtkHBox" id="hbox1">
-                <property name="visible">True</property>
-                <child>
-                  <object class="GtkCheckButton" 
id="GNUNET_GTK_publish_directory_dialog_do_index_checkbutton">
-                    <property name="label" translatable="yes">Index 
files</property>
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">False</property>
-                    <property name="use_action_appearance">False</property>
-                    <property name="use_underline">True</property>
-                    <property name="active">True</property>
-                    <property name="draw_indicator">True</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="padding">20</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
-                <child>
-                  <object class="GtkLabel" 
id="GNUNET_GTK_publish_directory_dialog_priority_label">
-                    <property name="visible">True</property>
-                    <property name="label" 
translatable="yes">Priority:</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="padding">13</property>
-                    <property name="position">2</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkSpinButton" 
id="GNUNET_GTK_publish_directory_dialog_priority_spin_button">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="invisible_char">•</property>
-                    <property name="adjustment">priority_adjustment</property>
-                    <property name="numeric">True</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="padding">20</property>
-                    <property name="position">3</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkHBox" id="hbox2">
-                <property name="visible">True</property>
-                <child>
-                  <object class="GtkLabel" 
id="GNUNET_GTK_publish_directory_dialog_expiration_label">
-                    <property name="visible">True</property>
-                    <property name="label" translatable="yes">Expiration 
year:</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="padding">20</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkSpinButton" 
id="GNUNET_GTK_publish_directory_dialog_expiration_year_spin_button">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="invisible_char">•</property>
-                    <property 
name="adjustment">expiration_year_adjustment</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" 
id="GNUNET_GTK_publish_directory_dialog_anonymity_label">
-                    <property name="visible">True</property>
-                    <property name="label" 
translatable="yes">Anonymity:</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="padding">5</property>
-                    <property name="position">2</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkSpinButton" 
id="GNUNET_GTK_publish_directory_dialog_anonymity_spin_button">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="invisible_char">•</property>
-                    <property name="adjustment">anonymity_adjustment</property>
-                    <property name="numeric">True</property>
-                    <signal name="value-changed" 
handler="GNUNET_GTK_anonymity_spin_button_value_changed_cb" swapped="no"/>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="padding">20</property>
-                    <property name="position">3</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="position">2</property>
-          </packing>
-        </child>
-        <child internal-child="action_area">
-          <object class="GtkHButtonBox" id="dialog-action_area3">
-            <property name="visible">True</property>
-            <property name="layout_style">end</property>
-            <child>
-              <object class="GtkButton" 
id="GNUNET_GTK_publish_dialog_cancel_button">
-                <property name="label">gtk-cancel</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
-                <property name="use_stock">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkButton" 
id="GNUNET_GTK_publish_directory_dialog_ok_button">
-                <property name="label">gtk-ok</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="can_default">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
-                <property name="use_stock">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="pack_type">end</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-    <action-widgets>
-      <action-widget 
response="-6">GNUNET_GTK_publish_dialog_cancel_button</action-widget>
-      <action-widget 
response="-5">GNUNET_GTK_publish_directory_dialog_ok_button</action-widget>
-    </action-widgets>
-  </object>
-  <object class="GtkAdjustment" id="anonymity_adjustment">
-    <property name="upper">10000000</property>
-    <property name="value">1</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
-  </object>
-</interface>

Deleted: gnunet-gtk/contrib/publish-file-dialog.glade
===================================================================
--- gnunet-gtk/contrib/publish-file-dialog.glade        2011-08-15 14:17:12 UTC 
(rev 16548)
+++ gnunet-gtk/contrib/publish-file-dialog.glade        2011-08-15 14:20:33 UTC 
(rev 16549)
@@ -1,216 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <requires lib="gtk+" version="2.20"/>
-  <!-- interface-naming-policy project-wide -->
-  <object class="GtkFileChooserDialog" id="GNUNET_GTK_publish_file_dialog">
-    <property name="can_default">True</property>
-    <property name="border_width">5</property>
-    <property name="title" translatable="yes">Publish file...</property>
-    <property name="type_hint">normal</property>
-    <property name="has_separator">False</property>
-    <property name="select_multiple">True</property>
-    <property name="create_folders">False</property>
-    <child internal-child="vbox">
-      <object class="GtkVBox" id="dialog-vbox1">
-        <property name="visible">True</property>
-        <property name="spacing">2</property>
-        <child>
-          <object class="GtkVBox" id="vbox1">
-            <property name="visible">True</property>
-            <child>
-              <object class="GtkHBox" id="hbox1">
-                <property name="visible">True</property>
-                <child>
-                  <object class="GtkCheckButton" 
id="GNUNET_GTK_publish_file_dialog_do_index_checkbutton">
-                    <property name="label" translatable="yes">Index 
file</property>
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">False</property>
-                    <property name="use_action_appearance">False</property>
-                    <property name="use_underline">True</property>
-                    <property name="active">True</property>
-                    <property name="draw_indicator">True</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="padding">20</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
-                <child>
-                  <object class="GtkLabel" 
id="GNUNET_GTK_publish_file_dialog_priority_label">
-                    <property name="visible">True</property>
-                    <property name="label" 
translatable="yes">Priority:</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="padding">13</property>
-                    <property name="position">2</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkSpinButton" 
id="GNUNET_GTK_publish_file_dialog_priority_spin_button">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="invisible_char">•</property>
-                    <property name="adjustment">priority_adjustment</property>
-                    <property name="numeric">True</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="padding">20</property>
-                    <property name="position">3</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkHBox" id="hbox2">
-                <property name="visible">True</property>
-                <child>
-                  <object class="GtkLabel" 
id="GNUNET_GTK_publish_file_dialog_expiration_label">
-                    <property name="visible">True</property>
-                    <property name="label" translatable="yes">Expiration 
year:</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="padding">20</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkSpinButton" 
id="GNUNET_GTK_publish_file_dialog_expiration_year_spin_button">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="invisible_char">•</property>
-                    <property 
name="adjustment">expiration_year_adjustment</property>
-                    <property name="numeric">True</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" 
id="GNUNET_GTK_publish_file_dialog_anonymity_label">
-                    <property name="visible">True</property>
-                    <property name="label" 
translatable="yes">Anonymity:</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="padding">5</property>
-                    <property name="position">2</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkSpinButton" 
id="GNUNET_GTK_publish_file_dialog_anonymity_spin_button">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="invisible_char">•</property>
-                    <property name="adjustment">anonymity_adjustment</property>
-                    <property name="numeric">True</property>
-                    <signal name="value-changed" 
handler="GNUNET_GTK_anonymity_spin_button_value_changed_cb" swapped="no"/>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="padding">20</property>
-                    <property name="position">3</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="position">2</property>
-          </packing>
-        </child>
-        <child internal-child="action_area">
-          <object class="GtkHButtonBox" id="dialog-action_area2">
-            <property name="visible">True</property>
-            <property name="layout_style">end</property>
-            <child>
-              <object class="GtkButton" 
id="GNUNET_GTK_publish_file_dialog_cancel_button">
-                <property name="label">gtk-cancel</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
-                <property name="use_stock">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkButton" 
id="GNUNET_GTK_publish_file_dialog_ok_button">
-                <property name="label">gtk-ok</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="can_default">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
-                <property name="use_stock">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="pack_type">end</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-    <action-widgets>
-      <action-widget 
response="-6">GNUNET_GTK_publish_file_dialog_cancel_button</action-widget>
-      <action-widget 
response="-5">GNUNET_GTK_publish_file_dialog_ok_button</action-widget>
-    </action-widgets>
-  </object>
-  <object class="GtkAdjustment" id="priority_adjustment">
-    <property name="upper">100000000</property>
-    <property name="value">1000</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
-  </object>
-  <object class="GtkListStore" 
id="GNUNET_GTK_publish_file_dialog_expiration_list_store">
-    <columns>
-      <!-- column-name human_readable_time -->
-      <column type="gchararray"/>
-      <!-- column-name time_in_ms -->
-      <column type="guint64"/>
-    </columns>
-  </object>
-  <object class="GtkAdjustment" id="anonymity_adjustment">
-    <property name="upper">10000000</property>
-    <property name="value">1</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
-  </object>
-  <object class="GtkAdjustment" id="expiration_year_adjustment">
-    <property name="upper">9999</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
-  </object>
-</interface>

Deleted: gnunet-gtk/contrib/publish_dialog.glade
===================================================================
--- gnunet-gtk/contrib/publish_dialog.glade     2011-08-15 14:17:12 UTC (rev 
16548)
+++ gnunet-gtk/contrib/publish_dialog.glade     2011-08-15 14:20:33 UTC (rev 
16549)
@@ -1,499 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <requires lib="gtk+" version="2.20"/>
-  <!-- interface-naming-policy project-wide -->
-  <object class="GtkAdjustment" id="adjustment4">
-    <property name="upper">100</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
-    <property name="page_size">10</property>
-  </object>
-  <object class="GtkAdjustment" id="adjustment3">
-    <property name="upper">100</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
-    <property name="page_size">10</property>
-  </object>
-  <object class="GtkAdjustment" id="adjustment2">
-    <property name="upper">100</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
-    <property name="page_size">10</property>
-  </object>
-  <object class="GtkAdjustment" id="adjustment1">
-    <property name="upper">100</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
-    <property name="page_size">10</property>
-  </object>
-  <object class="GtkImage" id="right_stock_image">
-    <property name="visible">True</property>
-    <property name="stock">gtk-go-forward</property>
-  </object>
-  <object class="GtkImage" id="left_stock_image">
-    <property name="visible">True</property>
-    <property name="stock">gtk-go-back</property>
-  </object>
-  <object class="GtkImage" id="add_stock_image_2">
-    <property name="visible">True</property>
-    <property name="stock">gtk-add</property>
-  </object>
-  <object class="GtkImage" id="new_stock_image">
-    <property name="visible">True</property>
-    <property name="stock">gtk-new</property>
-  </object>
-  <object class="GtkImage" id="add_stock_image">
-    <property name="visible">True</property>
-    <property name="stock">gtk-add</property>
-  </object>
-  <object class="GtkTreeStore" 
id="GNUNET_GTK_file_sharing_publishing_tree_store">
-    <columns>
-      <!-- column-name filesize -->
-      <column type="gchararray"/>
-      <!-- column-name do_index -->
-      <column type="gboolean"/>
-      <!-- column-name filename -->
-      <column type="gchararray"/>
-      <!-- column-name anonymity_level -->
-      <column type="guint"/>
-      <!-- column-name priority -->
-      <column type="guint"/>
-      <!-- column-name file_information_struct -->
-      <column type="gpointer"/>
-    </columns>
-  </object>
-  <object class="GtkDialog" id="GNUNET_GTK_master_publish_dialog">
-    <property name="height_request">500</property>
-    <property name="border_width">5</property>
-    <property name="title" translatable="yes">Publish content on 
GNUnet</property>
-    <property name="modal">True</property>
-    <property name="window_position">center-on-parent</property>
-    <property name="type_hint">dialog</property>
-    <property name="skip_taskbar_hint">True</property>
-    <property name="has_separator">False</property>
-    <child internal-child="vbox">
-      <object class="GtkVBox" id="GNUNET_GTK_master_publish_dialog_vbox">
-        <property name="visible">True</property>
-        <property name="spacing">2</property>
-        <child>
-          <object class="GtkVBox" 
id="GNUNET_GTK_master_publish_dialog_file_information_vbox">
-            <property name="visible">True</property>
-            <child>
-              <object class="GtkScrolledWindow" 
id="GNUNET_GTK_master_publish_dialog_file_information_scrolled_window">
-                <property name="height_request">100</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="hadjustment">adjustment1</property>
-                <property name="vadjustment">adjustment2</property>
-                <property name="hscrollbar_policy">automatic</property>
-                <property name="vscrollbar_policy">automatic</property>
-                <child>
-                  <object class="GtkTreeView" 
id="GNUNET_GTK_master_publish_dialog_file_information_tree_view">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property 
name="model">GNUNET_GTK_file_sharing_publishing_tree_store</property>
-                    <property name="hadjustment">adjustment1</property>
-                    <property name="vadjustment">adjustment2</property>
-                    <property name="enable_tree_lines">True</property>
-                    <child>
-                      <object class="GtkTreeViewColumn" 
id="GNUNET_GTK_master_publish_dialog_file_information_filesize_column">
-                        <property name="sizing">autosize</property>
-                        <property name="title" 
translatable="yes">Size</property>
-                        <child>
-                          <object class="GtkCellRendererText" 
id="GNUNET_GTK_master_publish_dialog_file_information_filesize_renderer"/>
-                          <attributes>
-                            <attribute name="text">0</attribute>
-                          </attributes>
-                        </child>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkTreeViewColumn" 
id="GNUNET_GTK_master_publish_dialog_file_information_filename_column">
-                        <property name="resizable">True</property>
-                        <property name="sizing">autosize</property>
-                        <property name="title" 
translatable="yes">Filename</property>
-                        <property name="expand">True</property>
-                        <property name="clickable">True</property>
-                        <property name="reorderable">True</property>
-                        <property name="sort_indicator">True</property>
-                        <child>
-                          <object class="GtkCellRendererText" 
id="GNUNET_GTK_master_publish_dialog_file_information_filename_renderer"/>
-                          <attributes>
-                            <attribute name="text">2</attribute>
-                          </attributes>
-                        </child>
-                      </object>
-                    </child>
-                  </object>
-                </child>
-              </object>
-              <packing>
-                <property name="expand">True</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">True</property>
-            <property name="fill">True</property>
-            <property name="padding">8</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkHBox" 
id="GNUNET_GTK_master_dialog_modification_button_hbox">
-            <property name="visible">True</property>
-            <child>
-              <object class="GtkTable" 
id="GNUNET_GTK_master_publish_dialog_action_table">
-                <property name="visible">True</property>
-                <property name="n_rows">2</property>
-                <property name="n_columns">3</property>
-                <child>
-                  <object class="GtkButton" 
id="GNUNET_GTK_master_publish_dialog_add_button">
-                    <property name="label">Add _File</property>
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">True</property>
-                    <property name="use_action_appearance">False</property>
-                    <property name="image">add_stock_image</property>
-                    <property name="use_underline">True</property>
-                    <signal name="clicked" 
handler="GNUNET_GTK_master_publish_dialog_add_button_clicked_cb" swapped="no"/>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkButton" 
id="GNUNET_GTK_master_publish_dialog_open_button">
-                    <property name="label">Add _Directory</property>
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">True</property>
-                    <property name="use_action_appearance">False</property>
-                    <property name="image">add_stock_image_2</property>
-                    <property name="use_underline">True</property>
-                    <signal name="clicked" 
handler="GNUNET_GTK_master_publish_dialog_open_button_clicked_cb" swapped="no"/>
-                  </object>
-                  <packing>
-                    <property name="top_attach">1</property>
-                    <property name="bottom_attach">2</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkButton" 
id="GNUNET_GTK_master_publish_dialog_delete_button">
-                    <property name="label">gtk-delete</property>
-                    <property name="visible">True</property>
-                    <property name="sensitive">False</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">True</property>
-                    <property name="use_action_appearance">False</property>
-                    <property name="use_stock">True</property>
-                    <signal name="clicked" 
handler="GNUNET_GTK_master_publish_dialog_delete_button_clicked_cb" 
swapped="no"/>
-                  </object>
-                  <packing>
-                    <property name="left_attach">2</property>
-                    <property name="right_attach">3</property>
-                    <property name="top_attach">1</property>
-                    <property name="bottom_attach">2</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkButton" 
id="GNUNET_GTK_master_publish_dialog_edit_button">
-                    <property name="label">gtk-edit</property>
-                    <property name="visible">True</property>
-                    <property name="sensitive">False</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">True</property>
-                    <property name="use_action_appearance">False</property>
-                    <property name="use_stock">True</property>
-                    <signal name="clicked" 
handler="GNUNET_GTK_master_publish_dialog_edit_button_clicked_cb" swapped="no"/>
-                  </object>
-                  <packing>
-                    <property name="left_attach">1</property>
-                    <property name="right_attach">2</property>
-                    <property name="top_attach">1</property>
-                    <property name="bottom_attach">2</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkButton" 
id="GNUNET_GTK_master_publish_dialog_new_button">
-                    <property name="label">_Create empty directory</property>
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">True</property>
-                    <property name="use_action_appearance">False</property>
-                    <property name="image">new_stock_image</property>
-                    <property name="use_underline">True</property>
-                    <signal name="clicked" 
handler="GNUNET_GTK_master_publish_dialog_new_button_clicked_cb" swapped="no"/>
-                  </object>
-                  <packing>
-                    <property name="left_attach">1</property>
-                    <property name="right_attach">3</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="padding">25</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkTable" 
id="GNUNET_GTK_master_publish_dialog_arrow_table">
-                <property name="visible">True</property>
-                <property name="n_rows">2</property>
-                <property name="n_columns">3</property>
-                <property name="homogeneous">True</property>
-                <child>
-                  <object class="GtkButton" 
id="GNUNET_GTK_master_publish_dialog_up_button">
-                    <property name="label">gtk-go-up</property>
-                    <property name="visible">True</property>
-                    <property name="sensitive">False</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">True</property>
-                    <property name="use_action_appearance">False</property>
-                    <property name="use_stock">True</property>
-                    <signal name="clicked" 
handler="GNUNET_GTK_master_publish_dialog_up_button_clicked_cb" swapped="no"/>
-                  </object>
-                  <packing>
-                    <property name="left_attach">1</property>
-                    <property name="right_attach">2</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkButton" 
id="GNUNET_GTK_master_publish_dialog_down_button">
-                    <property name="label">gtk-go-down</property>
-                    <property name="visible">True</property>
-                    <property name="sensitive">False</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">True</property>
-                    <property name="use_action_appearance">False</property>
-                    <property name="use_stock">True</property>
-                    <signal name="clicked" 
handler="GNUNET_GTK_master_publish_dialog_down_button_clicked_cb" swapped="no"/>
-                  </object>
-                  <packing>
-                    <property name="left_attach">1</property>
-                    <property name="right_attach">2</property>
-                    <property name="top_attach">1</property>
-                    <property name="bottom_attach">2</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkButton" 
id="GNUNET_GTK_master_publish_dialog_left_button">
-                    <property name="label">_Left</property>
-                    <property name="visible">True</property>
-                    <property name="sensitive">False</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">True</property>
-                    <property name="use_action_appearance">False</property>
-                    <property name="image">left_stock_image</property>
-                    <property name="use_underline">True</property>
-                    <signal name="clicked" 
handler="GNUNET_GTK_master_publish_dialog_left_button_clicked_cb" swapped="no"/>
-                  </object>
-                  <packing>
-                    <property name="top_attach">1</property>
-                    <property name="bottom_attach">2</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkButton" 
id="GNUNET_GTK_master_publish_dialog_right_button">
-                    <property name="label">_Right</property>
-                    <property name="visible">True</property>
-                    <property name="sensitive">False</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">True</property>
-                    <property name="use_action_appearance">False</property>
-                    <property name="image">right_stock_image</property>
-                    <property name="use_underline">True</property>
-                    <signal name="clicked" 
handler="GNUNET_GTK_master_publish_dialog_right_button_clicked_cb" 
swapped="no"/>
-                  </object>
-                  <packing>
-                    <property name="left_attach">2</property>
-                    <property name="right_attach">3</property>
-                    <property name="top_attach">1</property>
-                    <property name="bottom_attach">2</property>
-                  </packing>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="padding">25</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkScrolledWindow" 
id="GNUNET_GTK_master_publish_dialog_pseudonym_scrolled_window">
-            <property name="height_request">100</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="hadjustment">adjustment3</property>
-            <property name="vadjustment">adjustment4</property>
-            <property name="hscrollbar_policy">automatic</property>
-            <property name="vscrollbar_policy">automatic</property>
-            <child>
-              <object class="GtkTreeView" 
id="GNUNET_GTK_master_publish_dialog_pseudonym_tree_view">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property 
name="model">GNUNET_GTK_pseudonym_tree_store</property>
-                <property name="hadjustment">adjustment3</property>
-                <property name="vadjustment">adjustment4</property>
-                <property name="reorderable">True</property>
-                <property name="rubber_banding">True</property>
-                <property name="enable_grid_lines">both</property>
-                <child>
-                  <object class="GtkTreeViewColumn" 
id="GNUNET_GTK_master_publish_dialog_pseudonym_name_column">
-                    <property name="resizable">True</property>
-                    <property name="title" 
translatable="yes">Pseudonym</property>
-                    <property name="clickable">True</property>
-                    <property name="reorderable">True</property>
-                    <property name="sort_indicator">True</property>
-                    <child>
-                      <object class="GtkCellRendererText" 
id="GNUNET_GTK_master_publish_dialog_pseudonym_name_renderer"/>
-                      <attributes>
-                        <attribute name="text">0</attribute>
-                      </attributes>
-                    </child>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkTreeViewColumn" 
id="GNUNET_GTK_master_publish_dialog_pseudonym_identifier_column">
-                    <property name="resizable">True</property>
-                    <property name="sizing">autosize</property>
-                    <property name="title" translatable="yes">Current 
identifier</property>
-                    <property name="clickable">True</property>
-                    <child>
-                      <object class="GtkCellRendererText" 
id="GNUNET_GTK_master_publish_dialog_pseudonym_identifier_renderer">
-                        <signal name="edited" 
handler="GNUNET_GTK_master_publish_dialog_pseudonym_identifier_renderer_edited_cb"
 swapped="no"/>
-                      </object>
-                      <attributes>
-                        <attribute name="editable">8</attribute>
-                        <attribute name="text">2</attribute>
-                      </attributes>
-                    </child>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkTreeViewColumn" 
id="GNUNET_GTK_master_publish_dialog_pseudonym_updates_column">
-                    <property name="resizable">True</property>
-                    <property name="sizing">autosize</property>
-                    <property name="fixed_width">5</property>
-                    <property name="title" translatable="yes">Update 
identifier</property>
-                    <child>
-                      <object class="GtkCellRendererText" 
id="GNUNET_GTK_master_publish_dialog_pseudonym_updates_renderer">
-                        <signal name="edited" 
handler="GNUNET_GTK_master_publish_dialog_pseudonym_updates_renderer_edited_cb" 
swapped="no"/>
-                      </object>
-                      <attributes>
-                        <attribute name="editable">7</attribute>
-                        <attribute name="text">5</attribute>
-                      </attributes>
-                    </child>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkTreeViewColumn" 
id="GNUNET_GTK_master_publish_dialog_pseudonym_description_column">
-                    <property name="title" translatable="yes">Description (of 
existing content)</property>
-                    <child>
-                      <object class="GtkCellRendererText" 
id="GNUNET_GTK_master_publish_dialog_pseudonym_description_renderer">
-                        <property name="wrap_mode">word</property>
-                      </object>
-                      <attributes>
-                        <attribute name="text">6</attribute>
-                      </attributes>
-                    </child>
-                  </object>
-                </child>
-              </object>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">2</property>
-          </packing>
-        </child>
-        <child internal-child="action_area">
-          <object class="GtkHButtonBox" 
id="GNUNET_GTK_master_publish_dialog_master_action_area">
-            <property name="visible">True</property>
-            <property name="layout_style">end</property>
-            <child>
-              <object class="GtkButton" 
id="GNUNET_GTK_master_publish_dialog_cancel_button">
-                <property name="label">gtk-cancel</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
-                <property name="use_stock">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkButton" 
id="GNUNET_GTK_master_publish_dialog_execute_button">
-                <property name="label">gtk-execute</property>
-                <property name="visible">True</property>
-                <property name="sensitive">False</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
-                <property name="use_stock">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="pack_type">end</property>
-            <property name="position">3</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-    <action-widgets>
-      <action-widget 
response="-6">GNUNET_GTK_master_publish_dialog_cancel_button</action-widget>
-      <action-widget 
response="-5">GNUNET_GTK_master_publish_dialog_execute_button</action-widget>
-    </action-widgets>
-  </object>
-  <object class="GtkTreeStore" id="GNUNET_GTK_pseudonym_tree_store">
-    <columns>
-      <!-- column-name local_name -->
-      <column type="gchararray"/>
-      <!-- column-name namespace_handle -->
-      <column type="gpointer"/>
-      <!-- column-name last_id -->
-      <column type="gchararray"/>
-      <!-- column-name last_uri -->
-      <column type="gchararray"/>
-      <!-- column-name last_meta -->
-      <column type="gpointer"/>
-      <!-- column-name next_id -->
-      <column type="gchararray"/>
-      <!-- column-name last_description_from_meta -->
-      <column type="gchararray"/>
-      <!-- column-name next_id_editable -->
-      <column type="gboolean"/>
-      <!-- column-name current_id_editable -->
-      <column type="gboolean"/>
-    </columns>
-  </object>
-</interface>

Deleted: gnunet-gtk/contrib/publish_edit_dialog.glade
===================================================================
--- gnunet-gtk/contrib/publish_edit_dialog.glade        2011-08-15 14:17:12 UTC 
(rev 16548)
+++ gnunet-gtk/contrib/publish_edit_dialog.glade        2011-08-15 14:20:33 UTC 
(rev 16549)
@@ -1,717 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <requires lib="gtk+" version="2.20"/>
-  <!-- interface-naming-policy project-wide -->
-  <object class="GtkAdjustment" id="adjustment2">
-    <property name="upper">100</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
-    <property name="page_size">10</property>
-  </object>
-  <object class="GtkAdjustment" id="adjustment1">
-    <property name="upper">100</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
-    <property name="page_size">10</property>
-  </object>
-  <object class="GtkListStore" id="GNUNET_GTK_metatype_list_store">
-    <columns>
-      <!-- column-name description -->
-      <column type="gchararray"/>
-      <!-- column-name guint1 -->
-      <column type="guint"/>
-      <!-- column-name helptext -->
-      <column type="gchararray"/>
-    </columns>
-  </object>
-  <object class="GtkListStore" id="GNUNET_GTK_meta_data_list_store">
-    <columns>
-      <!-- column-name extractor_meta_type -->
-      <column type="guint"/>
-      <!-- column-name extractor_meta_format -->
-      <column type="guint"/>
-      <!-- column-name extractor_meta_type_string -->
-      <column type="gchararray"/>
-      <!-- column-name extracotr_meta_value -->
-      <column type="gchararray"/>
-    </columns>
-  </object>
-  <object class="GtkDialog" id="GNUNET_GTK_edit_file_information_dialog">
-    <property name="border_width">5</property>
-    <property name="destroy_with_parent">True</property>
-    <property name="type_hint">dialog</property>
-    <property name="skip_taskbar_hint">True</property>
-    <property name="has_separator">False</property>
-    <child internal-child="vbox">
-      <object class="GtkVBox" 
id="GNUNET_GTK_edit_file_information_master_vbox">
-        <property name="visible">True</property>
-        <property name="spacing">2</property>
-        <child>
-          <object class="GtkHBox" 
id="GNUNET_GTK_edit_file_information_metadata_hbox">
-            <property name="visible">True</property>
-            <child>
-              <object class="GtkVBox" 
id="GNUNET_GTK_edit_file_information_metadata_vbox">
-                <property name="visible">True</property>
-                <property name="spacing">5</property>
-                <child>
-                  <object class="GtkHBox" 
id="GNUNET_GTK_edit_file_information_metadata_edit_hbox">
-                    <property name="visible">True</property>
-                    <child>
-                      <object class="GtkLabel" 
id="GNUNET_GTK_edit_file_information_metadata_type_label">
-                        <property name="visible">True</property>
-                        <property name="label" 
translatable="yes">Type:</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkScrolledWindow" 
id="GNUNET_GTK_edit_file_information_metadata_type_scrolled_window">
-                        <property name="height_request">100</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="hscrollbar_policy">never</property>
-                        <property name="vscrollbar_policy">automatic</property>
-                        <child>
-                          <object class="GtkTreeView" 
id="GNUNET_GTK_edit_file_information_metadata_type_tree_view">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property 
name="model">GNUNET_GTK_metatype_list_store</property>
-                            <property name="headers_visible">False</property>
-                            <property name="headers_clickable">False</property>
-                            <property name="reorderable">True</property>
-                            <property name="enable_search">False</property>
-                            <property name="tooltip_column">2</property>
-                            <child>
-                              <object class="GtkTreeViewColumn" 
id="GNUNET_GTK_edit_file_information_metadata_type_tree_view_column">
-                                <property name="title" 
translatable="yes">Value</property>
-                                <property name="sort_column_id">0</property>
-                                <child>
-                                  <object class="GtkCellRendererText" 
id="GNUNET_GTK_edit_file_information_metadata_type_tree_view_renderer"/>
-                                  <attributes>
-                                    <attribute name="text">0</attribute>
-                                  </attributes>
-                                </child>
-                              </object>
-                            </child>
-                          </object>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkLabel" 
id="GNUNET_GTK_edit_file_information_metadata_value_label">
-                        <property name="visible">True</property>
-                        <property name="label" 
translatable="yes">Value:</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
-                        <property name="padding">5</property>
-                        <property name="position">2</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkEntry" 
id="GNUNET_GTK_edit_file_information_metadata_value_entry">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="invisible_char">●</property>
-                        <signal name="changed" 
handler="GNUNET_GTK_edit_file_information_metadata_value_entry_changed_cb" 
swapped="no"/>
-                      </object>
-                      <packing>
-                        <property name="position">3</property>
-                      </packing>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkScrolledWindow" 
id="GNUNET_GTK_edit_file_information_metadata_scrolled_window">
-                    <property name="width_request">400</property>
-                    <property name="height_request">120</property>
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="hadjustment">adjustment1</property>
-                    <property name="vadjustment">adjustment2</property>
-                    <property name="hscrollbar_policy">automatic</property>
-                    <property name="vscrollbar_policy">automatic</property>
-                    <child>
-                      <object class="GtkTreeView" 
id="GNUNET_GTK_edit_file_information_metadata_tree_view">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property 
name="model">GNUNET_GTK_meta_data_list_store</property>
-                        <property name="hadjustment">adjustment1</property>
-                        <property name="vadjustment">adjustment2</property>
-                        <property name="enable_search">False</property>
-                        <child>
-                          <object class="GtkTreeViewColumn" 
id="GNUNET_GTK_edit_file_information_metadata_tree_view_type_column">
-                            <property name="sizing">fixed</property>
-                            <property name="fixed_width">120</property>
-                            <property name="title" 
translatable="yes">Type</property>
-                            <property name="reorderable">True</property>
-                            <property name="sort_column_id">2</property>
-                            <child>
-                              <object class="GtkCellRendererText" 
id="GNUNET_GTK_edit_file_information_metadata_tree_view_type_renderer"/>
-                              <attributes>
-                                <attribute name="text">2</attribute>
-                              </attributes>
-                            </child>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkTreeViewColumn" 
id="GNUNET_GTK_edit_file_information_metadata_tree_view_description_column">
-                            <property name="title" 
translatable="yes">Value</property>
-                            <property name="expand">True</property>
-                            <property name="reorderable">True</property>
-                            <property name="sort_column_id">3</property>
-                            <child>
-                              <object class="GtkCellRendererText" 
id="GNUNET_GTK_edit_file_information_metadata_tree_view_value_renderer"/>
-                              <attributes>
-                                <attribute name="text">3</attribute>
-                              </attributes>
-                            </child>
-                          </object>
-                        </child>
-                      </object>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkVBox" 
id="GNUNET_GTK_edit_file_information_metadata_button_vbox">
-                <property name="visible">True</property>
-                <child>
-                  <object class="GtkButton" 
id="GNUNET_GTK_edit_file_information_metadata_add_button">
-                    <property name="label">gtk-add</property>
-                    <property name="visible">True</property>
-                    <property name="sensitive">False</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">True</property>
-                    <property name="use_action_appearance">False</property>
-                    <property name="use_stock">True</property>
-                    <signal name="clicked" 
handler="GNUNET_GTK_edit_file_information_metadata_add_button_clicked_cb" 
swapped="no"/>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkButton" 
id="GNUNET_GTK_edit_file_information_metadata_delete_button">
-                    <property name="label">gtk-delete</property>
-                    <property name="visible">True</property>
-                    <property name="sensitive">False</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">True</property>
-                    <property name="use_action_appearance">False</property>
-                    <property name="use_stock">True</property>
-                    <signal name="clicked" 
handler="GNUNET_GTK_edit_file_information_metadata_delete_button_clicked_cb" 
swapped="no"/>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="padding">5</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" 
id="GNUNET_GTK_edit_file_information_metadata_preview_label">
-                    <property name="visible">True</property>
-                    <property name="label" 
translatable="yes">Preview:</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="padding">10</property>
-                    <property name="position">2</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkImage" 
id="GNUNET_GTK_edit_file_information_metadata_preview_image">
-                    <property name="visible">True</property>
-                    <property name="sensitive">False</property>
-                    <property name="stock">gtk-missing-image</property>
-                  </object>
-                  <packing>
-                    <property name="position">3</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkFileChooserButton" 
id="GNUNET_GTK_edit_file_information_metadata_preview_file_chooser_button">
-                    <property name="visible">True</property>
-                    <property name="create_folders">False</property>
-                    <property name="title" translatable="yes">Select 
file</property>
-                    <signal name="file-set" 
handler="GNUNET_GTK_edit_file_information_metadata_preview_file_chooser_button_file_set_cb"
 swapped="no"/>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="position">4</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="padding">5</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="position">1</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkHBox" 
id="GNUNET_GTK_edit_file_information_secondary_hbox">
-            <property name="visible">True</property>
-            <child>
-              <object class="GtkVBox" 
id="GNUNET_GTK_edit_file_information_keyword_entry_vbox">
-                <property name="visible">True</property>
-                <child>
-                  <object class="GtkHBox" 
id="GNUNET_GTK_edit_file_information_keyword_hbox">
-                    <property name="visible">True</property>
-                    <child>
-                      <object class="GtkLabel" 
id="GNUNET_GTK_edit_file_information_keyword_label">
-                        <property name="visible">True</property>
-                        <property name="label" 
translatable="yes">_Keyword:</property>
-                        <property name="use_underline">True</property>
-                        <property 
name="mnemonic_widget">GNUNET_GTK_edit_file_information_keyword_entry</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkEntry" 
id="GNUNET_GTK_edit_file_information_keyword_entry">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="invisible_char">●</property>
-                        <property name="caps_lock_warning">False</property>
-                        <signal name="changed" 
handler="GNUNET_GTK_edit_file_information_keyword_entry_changed_cb" 
swapped="no"/>
-                        <signal name="activate" 
handler="GNUNET_GTK_edit_file_information_keyword_entry_activate_cb" 
swapped="no"/>
-                      </object>
-                      <packing>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="padding">5</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkHBox" 
id="GNUNET_GTK_edit_file_information_keyword_list_hbox">
-                    <property name="visible">True</property>
-                    <child>
-                      <object class="GtkScrolledWindow" 
id="GNUNET_GTK_edit_file_information_keyword_scrolled_window">
-                        <property name="width_request">400</property>
-                        <property name="height_request">120</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="hscrollbar_policy">never</property>
-                        <property name="vscrollbar_policy">automatic</property>
-                        <child>
-                          <object class="GtkTreeView" 
id="GNUNET_GTK_edit_file_information_keyword_list_tree_view">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property 
name="model">GNUNET_GTK_keyword_list_store</property>
-                            <property name="search_column">0</property>
-                            <child>
-                              <object class="GtkTreeViewColumn" 
id="GNUNET_GTK_edit_file_information_keyword_list_tree_view_column">
-                                <property name="title" 
translatable="yes">Keywords</property>
-                                <property name="reorderable">True</property>
-                                <property name="sort_column_id">0</property>
-                                <child>
-                                  <object class="GtkCellRendererText" 
id="GNUNET_GTK_edit_file_information_keyword_list_tree_view_renderer"/>
-                                  <attributes>
-                                    <attribute name="text">0</attribute>
-                                  </attributes>
-                                </child>
-                              </object>
-                            </child>
-                          </object>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkVBox" 
id="GNUNET_GTK_edit_file_information_keyword_list_button_vbox">
-                        <property name="visible">True</property>
-                        <child>
-                          <object class="GtkButton" 
id="GNUNET_GTK_edit_file_information_keyword_list_add_button">
-                            <property name="label">gtk-add</property>
-                            <property name="visible">True</property>
-                            <property name="sensitive">False</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">True</property>
-                            <property 
name="use_action_appearance">False</property>
-                            <property name="use_stock">True</property>
-                            <signal name="clicked" 
handler="GNUNET_GTK_edit_file_information_keyword_list_add_button_clicked_cb" 
swapped="no"/>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkButton" 
id="GNUNET_GTK_edit_file_information_keyword_list_del_button">
-                            <property name="label">gtk-delete</property>
-                            <property name="visible">True</property>
-                            <property name="sensitive">False</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">True</property>
-                            <property 
name="use_action_appearance">False</property>
-                            <property name="use_stock">True</property>
-                            <signal name="clicked" 
handler="GNUNET_GTK_edit_file_information_keyword_list_del_button_clicked_cb" 
swapped="no"/>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                            <property name="padding">5</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkButton" 
id="GNUNET_GTK_edit_file_information_keyword_list_normalize_button">
-                            <property name="label" 
translatable="yes">_Normalize</property>
-                            <property name="sensitive">False</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">True</property>
-                            <property 
name="use_action_appearance">False</property>
-                            <property name="use_underline">True</property>
-                            <signal name="clicked" 
handler="GNUNET_GTK_edit_file_information_keyword_list_normalize_button_clicked_cb"
 swapped="no"/>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                            <property name="position">2</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
-                        <property name="padding">5</property>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="padding">5</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkVBox" 
id="GNUNET_GTK_edit_file_information_misc_vbox">
-                <property name="visible">True</property>
-                <child>
-                  <object class="GtkLabel" 
id="GNUNET_GTK_edit_file_information_options_label">
-                    <property name="visible">True</property>
-                    <property name="label" 
translatable="yes">Options</property>
-                    <property name="justify">center</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="padding">5</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkHSeparator" id="hseparator3">
-                    <property name="visible">True</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkHBox" 
id="GNUNET_GTK_edit_file_information_anonymity_hbox">
-                    <property name="visible">True</property>
-                    <child>
-                      <object class="GtkLabel" 
id="GNUNET_GTK_edit_file_information_anonymity_label">
-                        <property name="visible">True</property>
-                        <property name="label" 
translatable="yes">_Anonymity:</property>
-                        <property name="use_underline">True</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
-                        <property name="padding">5</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkSpinButton" 
id="GNUNET_GTK_edit_file_information_anonymity_spin_button">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="tooltip_markup">Anonymity of zero 
means no anonymity.  Values larger than one require GNUnet to have cover 
traffic (with larger values implying more cover traffic).</property>
-                        <property name="invisible_char">●</property>
-                        <property 
name="adjustment">GNUNET_GTK_anonymity_adjustment</property>
-                        <signal name="value-changed" 
handler="GNUNET_GTK_anonymity_spin_button_value_changed_cb" after="yes" 
swapped="no"/>
-                      </object>
-                      <packing>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="position">2</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkHSeparator" id="hseparator1">
-                    <property name="visible">True</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="position">3</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkHBox" 
id="GNUNET_GTK_edit_file_information_priority_hbox">
-                    <property name="visible">True</property>
-                    <child>
-                      <object class="GtkLabel" 
id="GNUNET_GTK_edit_file_information_priority_label">
-                        <property name="visible">True</property>
-                        <property name="label" 
translatable="yes">_Priority:</property>
-                        <property name="use_underline">True</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="padding">5</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkSpinButton" 
id="GNUNET_GTK_edit_file_information_priority_spin_button">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="tooltip_markup">The content priority 
determines when content is discarded in favour of other, more popular content.  
</property>
-                        <property name="invisible_char">●</property>
-                        <property 
name="adjustment">priority_adjustment</property>
-                        <property name="numeric">True</property>
-                      </object>
-                      <packing>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="position">4</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkHSeparator" id="hseparator2">
-                    <property name="visible">True</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="position">5</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkHBox" 
id="GNUNET_GTK_edit_file_information_insert_hbox">
-                    <property name="visible">True</property>
-                    <child>
-                      <object class="GtkLabel" 
id="GNUNET_GTK_edit_file_information_index_label">
-                        <property name="visible">True</property>
-                        <property name="label" translatable="yes">_Index 
file</property>
-                        <property name="use_underline">True</property>
-                        <property 
name="mnemonic_widget">GNUNET_GTK_edit_file_information_index_check_button</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="padding">5</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkCheckButton" 
id="GNUNET_GTK_edit_file_information_index_check_button">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">False</property>
-                        <property name="tooltip_markup">Indexing saves space 
in the database but requires the file to remain unchanged in its original 
location afterwards.</property>
-                        <property name="use_action_appearance">False</property>
-                        <property name="draw_indicator">True</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="position">6</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkHSeparator" id="hseparator4">
-                    <property name="visible">True</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="position">7</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkHBox" id="hbox2">
-                    <property name="visible">True</property>
-                    <child>
-                      <object class="GtkLabel" 
id="GNUNET_GTK_edit_file_information_expiration_label">
-                        <property name="visible">True</property>
-                        <property name="label" translatable="yes">_Expriation 
year:</property>
-                        <property name="use_underline">True</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="padding">5</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkSpinButton" 
id="GNUNET_GTK_edit_file_information_expiration_year_spin_button">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="max_length">4</property>
-                        <property name="invisible_char">•</property>
-                        <property name="invisible_char_set">True</property>
-                        <property 
name="adjustment">expiration_year_adjustment</property>
-                        <property name="climb_rate">1</property>
-                        <property name="numeric">True</property>
-                      </object>
-                      <packing>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="position">8</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="padding">11</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="padding">5</property>
-            <property name="position">2</property>
-          </packing>
-        </child>
-        <child internal-child="action_area">
-          <object class="GtkHButtonBox" id="dialog-action_area13">
-            <property name="visible">True</property>
-            <property name="layout_style">end</property>
-            <child>
-              <object class="GtkButton" 
id="GNUNET_GTK_edit_file_information_cancel_button">
-                <property name="label">gtk-cancel</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
-                <property name="use_stock">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkButton" 
id="GNUNET_GTK_edit_file_information_confirm_button">
-                <property name="label">gtk-ok</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
-                <property name="use_stock">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="pack_type">end</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-    <action-widgets>
-      <action-widget 
response="-6">GNUNET_GTK_edit_file_information_cancel_button</action-widget>
-      <action-widget 
response="-5">GNUNET_GTK_edit_file_information_confirm_button</action-widget>
-    </action-widgets>
-  </object>
-  <object class="GtkListStore" id="GNUNET_GTK_keyword_list_store">
-    <columns>
-      <!-- column-name keyword -->
-      <column type="gchararray"/>
-    </columns>
-  </object>
-  <object class="GtkAdjustment" id="GNUNET_GTK_anonymity_adjustment">
-    <property name="upper">100000</property>
-    <property name="value">1</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
-  </object>
-  <object class="GtkAdjustment" id="priority_adjustment">
-    <property name="upper">10000000</property>
-    <property name="value">1000</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
-  </object>
-  <object class="GtkAdjustment" id="expiration_year_adjustment">
-    <property name="upper">9999</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
-  </object>
-</interface>

Deleted: gnunet-gtk/contrib/publish_tab.glade
===================================================================
--- gnunet-gtk/contrib/publish_tab.glade        2011-08-15 14:17:12 UTC (rev 
16548)
+++ gnunet-gtk/contrib/publish_tab.glade        2011-08-15 14:20:33 UTC (rev 
16549)
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <requires lib="gtk+" version="2.20"/>
-  <!-- interface-naming-policy project-wide -->
-  <object class="GtkWindow" id="_publish_frame_window">
-    <property name="title">You should never see this</property>
-
-                   <child>
-                      <object class="GtkScrolledWindow" 
id="_publish_frame_scrolled_window">
-                        <property name="height_request">100</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="hscrollbar_policy">automatic</property>
-                        <property name="vscrollbar_policy">automatic</property>
-
-    <child>
-      <object class="GtkTreeView" id="_publish_frame">
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <property name="model">_publish_frame_tree_store</property>
-        <property name="reorderable">True</property>
-        <property name="enable_tree_lines">True</property>
-        <child>
-          <object class="GtkTreeViewColumn" id="filename">
-            <property name="sizing">autosize</property>
-            <property name="title" translatable="yes">Filename</property>
-            <property name="expand">True</property>
-            <child>
-              <object class="GtkCellRendererProgress" id="filename_renderer"/>
-              <attributes>
-                <attribute name="cell-background">2</attribute>
-                <attribute name="text">0</attribute>
-                <attribute name="value">3</attribute>
-              </attributes>
-            </child>
-          </object>
-        </child>
-        <child>
-          <object class="GtkTreeViewColumn" id="filesize">
-            <property name="sizing">autosize</property>
-            <property name="title" translatable="yes">Size</property>
-            <child>
-              <object class="GtkCellRendererText" id="size_renderer"/>
-              <attributes>
-                <attribute name="background">2</attribute>
-                <attribute name="text">1</attribute>
-              </attributes>
-            </child>
-          </object>
-        </child>
-      </object>
-    </child>
-  </object>
-    </child>
-  </object>
-  <object class="GtkWindow" id="_publish_label_window">
-    <child>
-      <object class="GtkHBox" id="_publish_label_hbox">
-        <property name="visible">True</property>
-        <property name="border_width">5</property>
-        <child>
-          <object class="GtkLabel" id="_publish_label_window_label">
-            <property name="height_request">30</property>
-            <property name="visible">True</property>
-            <property name="label" translatable="yes">filename</property>
-          </object>
-          <packing>
-            <property name="fill">False</property>
-            <property name="padding">5</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkButton" id="_publish_label_close_button">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
-            <property name="use_action_appearance">False</property>
-            <property name="relief">half</property>
-            <child>
-              <object class="GtkImage" id="close_icon_stock_image">
-                <property name="visible">True</property>
-                <property name="stock">gtk-close</property>
-                <property name="icon-size">2</property>
-              </object>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">False</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-  </object>
-  <object class="GtkTreeStore" id="_publish_frame_tree_store">
-    <columns>
-      <!-- column-name filename -->
-      <column type="gchararray"/>
-      <!-- column-name filesize -->
-      <column type="gchararray"/>
-      <!-- column-name bgcolour -->
-      <column type="gchararray"/>
-      <!-- column-name progress -->
-      <column type="guint"/>
-    </columns>
-  </object>
-</interface>

Deleted: gnunet-gtk/contrib/search_dialog.glade
===================================================================
--- gnunet-gtk/contrib/search_dialog.glade      2011-08-15 14:17:12 UTC (rev 
16548)
+++ gnunet-gtk/contrib/search_dialog.glade      2011-08-15 14:20:33 UTC (rev 
16549)
@@ -1,238 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <requires lib="gtk+" version="2.20"/>
-  <!-- interface-naming-policy project-wide -->
-  <object class="GtkAdjustment" id="adjustment2">
-    <property name="upper">100</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
-    <property name="page_size">10</property>
-  </object>
-  <object class="GtkAdjustment" id="adjustment1">
-    <property name="upper">100</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
-    <property name="page_size">10</property>
-  </object>
-  <object class="GtkAdjustment" id="GNUNET_GTK_search_anonymity_adjustment">
-    <property name="upper">100000</property>
-    <property name="value">1</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
-  </object>
-  <object class="GtkDialog" id="GNUNET_GTK_search_dialog">
-    <property name="width_request">500</property>
-    <property name="height_request">350</property>
-    <property name="border_width">5</property>
-    <property name="title" translatable="yes">Search GNUnet</property>
-    <property name="modal">True</property>
-    <property name="destroy_with_parent">True</property>
-    <property name="icon_name">system-search</property>
-    <property name="type_hint">dialog</property>
-    <property name="skip_taskbar_hint">True</property>
-    <property name="skip_pager_hint">True</property>
-    <property name="has_separator">False</property>
-    <child internal-child="vbox">
-      <object class="GtkVBox" id="GNUNET_GTK_search_dialog_main_vbox">
-        <property name="visible">True</property>
-        <property name="spacing">2</property>
-        <child>
-          <object class="GtkHBox" id="GNUNET_GTK_search_dialog_query_hbox">
-            <property name="visible">True</property>
-            <child>
-              <object class="GtkLabel" 
id="GNUNET_GTK_search_dialog_keyword_label">
-                <property name="visible">True</property>
-                <property name="label" translatable="yes">_Query:</property>
-                <property name="use_underline">True</property>
-                <property name="selectable">True</property>
-                <property 
name="mnemonic_widget">GNUNET_GTK_search_dialog_keyword_entry</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkEntry" 
id="GNUNET_GTK_search_dialog_keyword_entry">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="invisible_char">●</property>
-                <property name="activates_default">True</property>
-                <property name="caps_lock_warning">False</property>
-                <property name="primary_icon_stock">gtk-find</property>
-                <property name="primary_icon_tooltip_text" 
translatable="yes">Separate multiple keywords with spaces, prefix mandatory 
keywords with "+"</property>
-                <signal name="activate" 
handler="GNUNET_GTK_search_dialog_search_button_clicked_cb" swapped="no"/>
-              </object>
-              <packing>
-                <property name="position">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel" 
id="GNUNET_GTK_search_dialog_anonymity_label">
-                <property name="visible">True</property>
-                <property name="label" 
translatable="yes">_Anonymity:</property>
-                <property name="use_underline">True</property>
-                <property name="selectable">True</property>
-                <property 
name="mnemonic_widget">GNUNET_GTK_search_dialog_anonymity_spin_button</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">2</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkSpinButton" 
id="GNUNET_GTK_search_dialog_anonymity_spin_button">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="invisible_char">●</property>
-                <property name="caps_lock_warning">False</property>
-                <property 
name="adjustment">GNUNET_GTK_search_anonymity_adjustment</property>
-                <property name="climb_rate">1</property>
-                <property name="numeric">True</property>
-                <signal name="value-changed" 
handler="GNUNET_GTK_anonymity_spin_button_value_changed_cb" swapped="no"/>
-              </object>
-              <packing>
-                <property name="position">3</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">False</property>
-            <property name="padding">5</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkScrolledWindow" 
id="GNUNET_GTK_search_dialog_namespace_scrolled_window">
-            <property name="height_request">100</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="hadjustment">adjustment1</property>
-            <property name="vadjustment">adjustment2</property>
-            <property name="hscrollbar_policy">automatic</property>
-            <property name="vscrollbar_policy">automatic</property>
-            <child>
-              <object class="GtkTreeView" 
id="GNUNET_GTK_search_dialog_namespace_tree_view">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property 
name="model">GNUNET_GTK_namespace_list_store</property>
-                <property name="hadjustment">adjustment1</property>
-                <property name="vadjustment">adjustment2</property>
-                <property name="reorderable">True</property>
-                <property name="rules_hint">True</property>
-                <signal name="row-activated" 
handler="GNUNET_GTK_search_dialog_namespace_tree_view_row_activated_cb" 
swapped="no"/>
-                <child>
-                  <object class="GtkTreeViewColumn" 
id="GNUNET_GTK_search_dialog_namespace_name_column">
-                    <property name="resizable">True</property>
-                    <property name="title" translatable="yes">Name</property>
-                    <property name="clickable">True</property>
-                    <property name="reorderable">True</property>
-                    <property name="sort_indicator">True</property>
-                    <child>
-                      <object class="GtkCellRendererText" 
id="GNUNET_GTK_search_dialog_namespace_name_renderer"/>
-                      <attributes>
-                        <attribute name="text">0</attribute>
-                      </attributes>
-                    </child>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkTreeViewColumn" 
id="GNUNET_GTK_search_dialog_namespace_root_column">
-                    <property name="resizable">True</property>
-                    <property name="title" translatable="yes">Root</property>
-                    <property name="clickable">True</property>
-                    <child>
-                      <object class="GtkCellRendererText" 
id="GNUNET_GTK_search_dialog_namespace_root_renderer"/>
-                      <attributes>
-                        <attribute name="text">1</attribute>
-                      </attributes>
-                    </child>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkTreeViewColumn" 
id="GNUNET_GTK_search_dialog_namespace_description_column">
-                    <property name="title" 
translatable="yes">Description</property>
-                    <property name="expand">True</property>
-                    <property name="clickable">True</property>
-                    <child>
-                      <object class="GtkCellRendererText" 
id="GNUNET_GTK_search_dialog_namespace_description_renderer">
-                        <property name="wrap_mode">word</property>
-                      </object>
-                      <attributes>
-                        <attribute name="text">3</attribute>
-                      </attributes>
-                    </child>
-                  </object>
-                </child>
-              </object>
-            </child>
-          </object>
-          <packing>
-            <property name="position">2</property>
-          </packing>
-        </child>
-        <child internal-child="action_area">
-          <object class="GtkHButtonBox" 
id="GNUNET_GTK_search_dialog_action_area">
-            <property name="visible">True</property>
-            <property name="layout_style">end</property>
-            <child>
-              <object class="GtkButton" 
id="GNUNET_GTK_search_dialog_cancel_button">
-                <property name="label">gtk-cancel</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
-                <property name="use_stock">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkButton" 
id="GNUNET_GTK_search_dialog_search_button">
-                <property name="label">gtk-find</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
-                <property name="use_stock">True</property>
-                <signal name="clicked" 
handler="GNUNET_GTK_search_dialog_search_button_clicked_cb" swapped="no"/>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="pack_type">end</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-    <action-widgets>
-      <action-widget 
response="-6">GNUNET_GTK_search_dialog_cancel_button</action-widget>
-      <action-widget 
response="0">GNUNET_GTK_search_dialog_search_button</action-widget>
-    </action-widgets>
-  </object>
-  <object class="GtkListStore" id="GNUNET_GTK_namespace_list_store">
-    <columns>
-      <!-- column-name unique_name -->
-      <column type="gchararray"/>
-      <!-- column-name namespace_root -->
-      <column type="gchararray"/>
-      <!-- column-name nsid -->
-      <column type="gpointer"/>
-      <!-- column-name namespace_description -->
-      <column type="gchararray"/>
-    </columns>
-  </object>
-</interface>

Deleted: gnunet-gtk/contrib/search_tab.glade
===================================================================
--- gnunet-gtk/contrib/search_tab.glade 2011-08-15 14:17:12 UTC (rev 16548)
+++ gnunet-gtk/contrib/search_tab.glade 2011-08-15 14:20:33 UTC (rev 16549)
@@ -1,245 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <requires lib="gtk+" version="2.20"/>
-  <!-- interface-naming-policy project-wide -->
-  <object class="GtkTreeStore" id="GNUNET_GTK_file_sharing_result_tree_store">
-    <columns>
-      <!-- column-name metadata -->
-      <column type="gpointer"/>
-      <!-- column-name uri -->
-      <column type="gpointer"/>
-      <!-- column-name filesize -->
-      <column type="guint64"/>
-      <!-- column-name preview -->
-      <column type="GdkPixbuf"/>
-      <!-- column-name percent_progress -->
-      <column type="guint"/>
-      <!-- column-name percent_availability -->
-      <column type="guint"/>
-      <!-- column-name filename -->
-      <column type="gchararray"/>
-      <!-- column-name uri_as_string -->
-      <column type="gchararray"/>
-      <!-- column-name status_colour -->
-      <column type="gchararray"/>
-      <!-- column-name struct_search_result -->
-      <column type="gpointer"/>
-      <!-- column-name mimetype -->
-      <column type="gchararray"/>
-      <!-- column-name applicability_rank -->
-      <column type="guint"/>
-      <!-- column-name availability_certainty -->
-      <column type="guint"/>
-      <!-- column-name availability_rank -->
-      <column type="gint"/>
-    </columns>
-  </object>
-  <object class="GtkWindow" id="_search_result_frame_window">
-    <property name="title">You should never see this</property>
-                   <child>
-                      <object class="GtkScrolledWindow" 
id="_search_frame_scrolled_window">
-                        <property name="height_request">100</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="hscrollbar_policy">automatic</property>
-                        <property name="vscrollbar_policy">automatic</property>
-
-    <child>
-      <object class="GtkTreeView" id="_search_result_frame">
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <property 
name="model">GNUNET_GTK_file_sharing_result_tree_store</property>
-        <property name="reorderable">True</property>
-        <property name="enable_grid_lines">horizontal</property>
-        <property name="enable_tree_lines">True</property>
-        <child>
-          <object class="GtkTreeViewColumn" 
id="search_result_description_column">
-            <property name="resizable">True</property>
-            <property name="sizing">autosize</property>
-            <property name="title" translatable="yes">Description</property>
-            <property name="expand">True</property>
-            <property name="clickable">True</property>
-            <property name="reorderable">True</property>
-            <property name="sort_indicator">True</property>
-            <property name="sort_column_id">6</property>
-            <child>
-              <object class="GtkCellRendererProgress" 
id="search_result_description_renderer"/>
-              <attributes>
-                <attribute name="cell-background">8</attribute>
-                <attribute name="text">6</attribute>
-                <attribute name="value">5</attribute>
-              </attributes>
-            </child>
-          </object>
-        </child>
-        <child>
-          <object class="GtkTreeViewColumn" id="search_result_mime_column">
-            <property name="sizing">autosize</property>
-            <property name="title" translatable="yes">Format</property>
-            <property name="clickable">True</property>
-            <property name="reorderable">True</property>
-            <property name="sort_indicator">True</property>
-            <property name="sort_column_id">10</property>
-            <child>
-              <object class="GtkCellRendererText" 
id="search_result_mime_renderer"/>
-              <attributes>
-                <attribute name="background">8</attribute>
-                <attribute name="text">10</attribute>
-              </attributes>
-            </child>
-          </object>
-        </child>
-        <child>
-          <object class="GtkTreeViewColumn" id="search_result_size_column">
-            <property name="sizing">autosize</property>
-            <property name="title" translatable="yes">Size</property>
-            <property name="reorderable">True</property>
-            <property name="sort_indicator">True</property>
-            <property name="sort_column_id">2</property>
-            <child>
-              <object class="GtkCellRendererProgress" 
id="search_result_size_renderer"/>
-              <attributes>
-                <attribute name="cell-background">8</attribute>
-                <attribute name="text">2</attribute>
-                <attribute name="value">4</attribute>
-              </attributes>
-            </child>
-          </object>
-        </child>
-        <child>
-          <object class="GtkTreeViewColumn" 
id="search_result_applicability_column">
-            <property name="sizing">autosize</property>
-            <property name="title">#</property>
-            <property name="reorderable">True</property>
-            <property name="sort_indicator">True</property>
-            <property name="sort_order">descending</property>
-            <property name="sort_column_id">11</property>
-            <child>
-              <object class="GtkCellRendererText" 
id="search_result_applicability_renderer"/>
-              <attributes>
-                <attribute name="background">8</attribute>
-                <attribute name="text">11</attribute>
-              </attributes>
-            </child>
-          </object>
-        </child>
-        <child>
-          <object class="GtkTreeViewColumn" id="search_result_preview_column">
-            <property name="min_width">128</property>
-            <property name="max_width">128</property>
-            <property name="title" translatable="yes">Preview</property>
-            <property name="reorderable">True</property>
-            <child>
-              <object class="GtkCellRendererPixbuf" 
id="search_result_preview_renderer"/>
-              <attributes>
-                <attribute name="pixbuf">3</attribute>
-              </attributes>
-            </child>
-          </object>
-        </child>
-      </object>
-    </child>
-  </object>
-    </child>
-  </object>
-  <object class="GtkWindow" id="_search_result_label_window">
-    <child>
-      <object class="GtkHBox" id="_search_result_label_hbox">
-        <property name="visible">True</property>
-        <property name="border_width">5</property>
-        <child>
-          <object class="GtkLabel" id="_search_result_label_window_label">
-            <property name="height_request">30</property>
-            <property name="visible">True</property>
-            <property name="label" translatable="yes">query</property>
-          </object>
-          <packing>
-            <property name="fill">False</property>
-            <property name="padding">5</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkButton" id="_search_result_label_play_button">
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
-            <property name="use_action_appearance">False</property>
-            <child>
-              <object class="GtkImage" id="play_icon_stock_image">
-                <property name="visible">True</property>
-                <property name="stock">gtk-media-play</property>
-                <property name="icon-size">2</property>
-              </object>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">False</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkButton" id="_search_result_label_pause_button">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
-            <property name="use_action_appearance">False</property>
-            <child>
-              <object class="GtkImage" id="pause_icon_stock_image">
-                <property name="visible">True</property>
-                <property name="stock">gtk-media-pause</property>
-                <property name="icon-size">2</property>
-              </object>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">False</property>
-            <property name="position">2</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkButton" id="_search_result_label_clear_button">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
-            <property name="use_action_appearance">False</property>
-            <child>
-              <object class="GtkImage" id="clear_icon_stock_image">
-                <property name="visible">True</property>
-                <property name="stock">gtk-clear</property>
-              </object>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">False</property>
-            <property name="padding">5</property>
-            <property name="position">3</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkButton" id="_search_result_label_close_button">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
-            <property name="use_action_appearance">False</property>
-            <property name="relief">half</property>
-            <child>
-              <object class="GtkImage" id="close_icon_stock_image">
-                <property name="visible">True</property>
-                <property name="stock">gtk-close</property>
-                <property name="icon-size">2</property>
-              </object>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">False</property>
-            <property name="position">4</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-  </object>
-</interface>

Deleted: gnunet-gtk/contrib/select_pseudonym_dialog.glade
===================================================================
--- gnunet-gtk/contrib/select_pseudonym_dialog.glade    2011-08-15 14:17:12 UTC 
(rev 16548)
+++ gnunet-gtk/contrib/select_pseudonym_dialog.glade    2011-08-15 14:20:33 UTC 
(rev 16549)
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <requires lib="gtk+" version="2.20"/>
-  <!-- interface-naming-policy project-wide -->
-  <object class="GtkAdjustment" id="adjustment2">
-    <property name="upper">100</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
-    <property name="page_size">10</property>
-  </object>
-  <object class="GtkAdjustment" id="adjustment1">
-    <property name="upper">100</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
-    <property name="page_size">10</property>
-  </object>
-  <object class="GtkDialog" id="GNUNET_GTK_select_pseudonym_dialog">
-    <property name="border_width">5</property>
-    <property name="title" translatable="yes">Select pseudonym...</property>
-    <property name="modal">True</property>
-    <property name="type_hint">normal</property>
-    <property name="has_separator">False</property>
-    <child internal-child="vbox">
-      <object class="GtkVBox" id="GNUNET_GTK_select_pseudonym_dialog_vbox">
-        <property name="visible">True</property>
-        <property name="spacing">2</property>
-        <child>
-          <object class="GtkScrolledWindow" 
id="GNUNET_GTK_select_pseudonym_scrolledwindow">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="hadjustment">adjustment1</property>
-            <property name="vadjustment">adjustment2</property>
-            <property name="hscrollbar_policy">automatic</property>
-            <property name="vscrollbar_policy">automatic</property>
-            <child>
-              <object class="GtkTreeView" 
id="GNUNET_GTK_select_pseudonym_tree_view">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property 
name="model">GNUNET_GTK_select_pseudonym_liststore</property>
-                <property name="hadjustment">adjustment1</property>
-                <property name="vadjustment">adjustment2</property>
-                <child>
-                  <object class="GtkTreeViewColumn" 
id="GNUNET_GTK_select_pseudonym_tree_view_column">
-                    <property name="title" translatable="yes">Name</property>
-                    <property name="expand">True</property>
-                    <property name="clickable">True</property>
-                    <property name="reorderable">True</property>
-                    <property name="sort_indicator">True</property>
-                    <property name="sort_column_id">0</property>
-                    <child>
-                      <object class="GtkCellRendererText" 
id="GNUNET_GTK_select_pseudonym_name_renderer"/>
-                      <attributes>
-                        <attribute name="text">0</attribute>
-                      </attributes>
-                    </child>
-                  </object>
-                </child>
-              </object>
-            </child>
-          </object>
-          <packing>
-            <property name="position">1</property>
-          </packing>
-        </child>
-        <child>
-          <placeholder/>
-        </child>
-        <child internal-child="action_area">
-          <object class="GtkHButtonBox" 
id="GNUNET_GTK_select_pseudonym_dialog_action_area">
-            <property name="visible">True</property>
-            <property name="layout_style">end</property>
-            <child>
-              <object class="GtkButton" 
id="GNUNET_GTK_select_pseudonym_cancel_button">
-                <property name="label">gtk-cancel</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
-                <property name="use_stock">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkButton" 
id="GNUNET_GTK_select_pseudonym_ok_button">
-                <property name="label">gtk-ok</property>
-                <property name="visible">True</property>
-                <property name="sensitive">False</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
-                <property name="use_stock">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="pack_type">end</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-    <action-widgets>
-      <action-widget 
response="-6">GNUNET_GTK_select_pseudonym_cancel_button</action-widget>
-      <action-widget 
response="-5">GNUNET_GTK_select_pseudonym_ok_button</action-widget>
-    </action-widgets>
-  </object>
-  <object class="GtkListStore" id="GNUNET_GTK_select_pseudonym_liststore">
-    <columns>
-      <!-- column-name namespace_name -->
-      <column type="gchararray"/>
-      <!-- column-name namespace_handle -->
-      <column type="gpointer"/>
-    </columns>
-  </object>
-</interface>

Deleted: gnunet-gtk/contrib/status_bar_menu.glade
===================================================================
--- gnunet-gtk/contrib/status_bar_menu.glade    2011-08-15 14:17:12 UTC (rev 
16548)
+++ gnunet-gtk/contrib/status_bar_menu.glade    2011-08-15 14:20:33 UTC (rev 
16549)
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <requires lib="gtk+" version="2.20"/>
-  <!-- interface-naming-policy project-wide -->
-  <object class="GtkMenu" id="GNUNET_GTK_status_bar_popup_menu">
-    <property name="visible">True</property>
-    <child>
-      <object class="GtkImageMenuItem" 
id="GNUNET_GTK_status_bar_popup_menu_quit">
-        <property name="label">gtk-quit</property>
-        <property name="visible">True</property>
-        <property name="tooltip_text" translatable="yes">Quit</property>
-        <property name="use_action_appearance">False</property>
-        <property name="use_underline">True</property>
-        <property name="use_stock">True</property>
-        <property name="always_show_image">True</property>
-        <signal name="activate" handler="GNUNET_GTK_quit_cb" swapped="no"/>
-      </object>
-    </child>
-  </object>
-</interface>

Copied: gnunet-gtk/gnunet-fs-gtk.desktop.in (from rev 16478, 
gnunet-gtk/gnunet-gtk.desktop.in)
===================================================================
--- gnunet-gtk/gnunet-fs-gtk.desktop.in                         (rev 0)
+++ gnunet-gtk/gnunet-fs-gtk.desktop.in 2011-08-15 14:20:33 UTC (rev 16549)
@@ -0,0 +1,19 @@
+[Desktop Entry]
+Version=1.0
+Name=GNUnet Secured P2P
+Name[es]=P2P segurizado GNUnet
+Name[fr]=P2P sécurisé GNUnet
+GenericName=GNUnet Client
+GenericName[fr]=Client GNUnet
+Comment=Share files using GNU's anonymous and censorship-resistant network
+Comment[de]=Sicherer Datentausch mit GNUnet P2P
+Comment[es]=Compartir datos con la red anónima y resistente a la censura de GNU
+Comment[fr]=Partager des fichiers sur le réseau anonyme et résistant à la 
censure de GNU
+
+Type=Application
+Exec=gnunet-gtk
+Icon=gnunet-gtk
+Terminal=false
+Categories=GTK;Network;P2P;FileTransfer;
+StartupNotify=true
+StartupWMClass=gnunet-gtk

Deleted: gnunet-gtk/gnunet-gtk.desktop.in
===================================================================
--- gnunet-gtk/gnunet-gtk.desktop.in    2011-08-15 14:17:12 UTC (rev 16548)
+++ gnunet-gtk/gnunet-gtk.desktop.in    2011-08-15 14:20:33 UTC (rev 16549)
@@ -1,19 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Name=GNUnet Secured P2P
-Name[es]=P2P segurizado GNUnet
-Name[fr]=P2P sécurisé GNUnet
-GenericName=GNUnet Client
-GenericName[fr]=Client GNUnet
-Comment=Share files using GNU's anonymous and censorship-resistant network
-Comment[de]=Sicherer Datentausch mit GNUnet P2P
-Comment[es]=Compartir datos con la red anónima y resistente a la censura de GNU
-Comment[fr]=Partager des fichiers sur le réseau anonyme et résistant à la 
censure de GNU
-
-Type=Application
-Exec=gnunet-gtk
-Icon=gnunet-gtk
-Terminal=false
-Categories=GTK;Network;P2P;FileTransfer;
-StartupNotify=true
-StartupWMClass=gnunet-gtk

Copied: gnunet-gtk/gnunet-setup-oxygen-cancel.png (from rev 16514, 
gnunet-setup/gnunet-setup-oxygen-cancel.png)
===================================================================
(Binary files differ)

Copied: gnunet-gtk/gnunet-setup-oxygen-ok.png (from rev 16514, 
gnunet-setup/gnunet-setup-oxygen-ok.png)
===================================================================
(Binary files differ)

Copied: gnunet-gtk/gnunet-setup.desktop.in (from rev 16514, 
gnunet-setup/gnunet-setup.desktop.in)
===================================================================
--- gnunet-gtk/gnunet-setup.desktop.in                          (rev 0)
+++ gnunet-gtk/gnunet-setup.desktop.in  2011-08-15 14:20:33 UTC (rev 16549)
@@ -0,0 +1,13 @@
+[Desktop Entry]
+Version=1.0
+Name=GNUnet Setup
+GenericName=GNUnet Setup
+Comment=Configure GNUnet
+
+Type=Application
+Exec=gnunet-setup
+Icon=gnunet-setup
+Terminal=false
+Categories=GTK;Network;P2P;FileTransfer;
+StartupNotify=true
+StartupWMClass=gnunet-setup




reply via email to

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