gnunet-svn
[Top][All Lists]
Advanced

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

[GNUnet-SVN] r20595 - in gnunet-gtk: contrib src/lib


From: gnunet
Subject: [GNUnet-SVN] r20595 - in gnunet-gtk: contrib src/lib
Date: Mon, 19 Mar 2012 09:46:17 +0100

Author: grothoff
Date: 2012-03-19 09:46:17 +0100 (Mon, 19 Mar 2012)
New Revision: 20595

Modified:
   gnunet-gtk/contrib/gnunet_fs_gtk_main_window.glade
   gnunet-gtk/contrib/gnunet_setup_gtk_main_window.glade
   gnunet-gtk/src/lib/eventloop.c
Log:
-LRN: nhandles -> fd_counter

Modified: gnunet-gtk/contrib/gnunet_fs_gtk_main_window.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_fs_gtk_main_window.glade  2012-03-19 08:27:11 UTC 
(rev 20594)
+++ gnunet-gtk/contrib/gnunet_fs_gtk_main_window.glade  2012-03-19 08:46:17 UTC 
(rev 20595)
@@ -1,7 +1,6 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <requires lib="gtk+" version="2.20"/>
-  <!-- interface-naming-policy toplevel-contextual -->
   <object class="GtkAdjustment" 
id="GNUNET_GTK_edit_publication_metadata_preview_image_horizontal_adjustment">
     <property name="upper">100</property>
     <property name="step_increment">1</property>
@@ -44,12 +43,6 @@
       <column type="gchararray"/>
     </columns>
   </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="GtkListStore" id="GNUNET_GTK_peer_info_list_store">
     <columns>
       <!-- column-name peer_identity -->
@@ -72,6 +65,48 @@
       <column type="gpointer"/>
     </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>
+  </object>
+  <object class="GtkAdjustment" id="adjustment4">
+    <property name="upper">100</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">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>
+  </object>
+  <object class="GtkAdjustment" id="adjustment6">
+    <property name="upper">100</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">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>
+  </object>
+  <object class="GtkAdjustment" id="adjustment8">
+    <property name="upper">100</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
   <object class="GtkListStore" id="anonymity_level_liststore">
     <columns>
       <!-- column-name Name -->
@@ -99,6 +134,21 @@
       </row>
     </data>
   </object>
+  <object class="GtkImage" id="down_stock_image">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="stock">gtk-go-down</property>
+  </object>
+  <object class="GtkImage" id="find_stock_image">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="stock">gtk-find</property>
+  </object>
+  <object class="GtkImage" id="index_stock_image">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="stock">gtk-index</property>
+  </object>
   <object class="GtkListStore" id="main_window_search_mime_liststore">
     <columns>
       <!-- column-name MIME -->
@@ -143,145 +193,171 @@
       </row>
     </data>
   </object>
-  <object class="GtkTreeStore" id="main_window_search_namespace_treestore">
-    <columns>
-      <!-- column-name Name -->
-      <column type="gchararray"/>
-      <!-- column-name Key -->
-      <column type="gpointer"/>
-      <!-- column-name Root -->
-      <column type="gchararray"/>
-      <!-- column-name Tooltip -->
-      <column type="gchararray"/>
-    </columns>
-  </object>
   <object class="GtkWindow" id="GNUNET_GTK_main_window">
+    <property name="can_focus">False</property>
+    <property name="events">GDK_BUTTON_PRESS_MASK | 
GDK_STRUCTURE_MASK</property>
     <property name="title" translatable="yes">gnunet-fs-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="size_request" 
handler="GNUNET_FS_GTK_main_window_size_request"/>
-    <signal name="drag_end" handler="GNUNET_FS_GTK_main_window_drag_end"/>
-    <signal name="delete_event" handler="GNUNET_FS_GTK_delete_event_cb" 
after="yes"/>
+    <signal name="button-press-event" 
handler="GNUNET_FS_GTK_main_window_button_press_event" swapped="no"/>
+    <signal name="delete-event" handler="GNUNET_FS_GTK_delete_event_cb" 
after="yes" swapped="no"/>
+    <signal name="drag-end" handler="GNUNET_FS_GTK_main_window_drag_end" 
swapped="no"/>
     <child>
       <object class="GtkVBox" id="GNUNET_GTK_main_window_vbox">
         <property name="visible">True</property>
-        <property name="orientation">vertical</property>
+        <property name="can_focus">False</property>
         <child>
+          <object class="GtkStatusbar" id="GNUNET_GTK_status_bar">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="spacing">2</property>
+          </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="GtkMenuBar" id="GNUNET_GTK_main_menu">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
             <child>
               <object class="GtkMenuItem" 
id="GNUNET_GTK_main_menu_file_sharing">
+                <property name="use_action_appearance">False</property>
                 <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>
                 <child type="submenu">
                   <object class="GtkMenu" 
id="GNUNET_GTK_main_menu_file_sharing_box">
+                    <property name="can_focus">False</property>
                     <child>
                       <object class="GtkImageMenuItem" 
id="GNUNET_GTK_main_menu_file_publish">
                         <property name="label" 
translatable="yes">_Publish</property>
+                        <property name="use_action_appearance">False</property>
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="tooltip_text" 
translatable="yes">Publish files or directories on GNUnet</property>
                         <property name="accel_path">&lt;gnunet-fs-gtk&gt;/File 
sharing/Publish</property>
                         <property name="use_underline">True</property>
                         <property name="image">up_stock_image</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"/>
+                        <signal name="activate" 
handler="GNUNET_GTK_main_menu_file_publish_activate_cb" swapped="no"/>
                       </object>
                     </child>
                     <child>
                       <object class="GtkMenuItem" 
id="GNUNET_GTK_main_menu_unindex">
+                        <property name="use_action_appearance">False</property>
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="label" translatable="yes">_List 
indexed files</property>
                         <property name="use_underline">True</property>
-                        <signal name="activate" 
handler="GNUNET_GTK_main_menu_unindex_activate_cb"/>
+                        <signal name="activate" 
handler="GNUNET_GTK_main_menu_unindex_activate_cb" swapped="no"/>
                       </object>
                     </child>
                     <child>
                       <object class="GtkSeparatorMenuItem" 
id="GNUNET_GTK_main_menu_file_sep1">
                         <property name="visible">True</property>
+                        <property name="can_focus">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="use_action_appearance">False</property>
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="tooltip_text" 
translatable="yes">Download a file or directory with a known URI.</property>
                         <property name="accel_path">&lt;gnunet-fs-gtk&gt;/File 
sharing/Download</property>
                         <property name="use_underline">True</property>
                         <property name="image">down_stock_image</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"/>
+                        <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="use_action_appearance">False</property>
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="tooltip_text" translatable="yes">Use 
this option to browse a GNUnet directory file that has been previously 
downloaded.</property>
                         <property name="accel_path">&lt;gnunet-fs-gtk&gt;/File 
sharing/Open directory</property>
                         <property name="use_underline">True</property>
                         <property name="image">open_stock_image</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"/>
+                        <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_sep2">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                       </object>
                     </child>
                     <child>
                       <object class="GtkImageMenuItem" 
id="GNUNET_GTK_main_menu_file_create_pseudonym">
                         <property name="label" translatable="yes">_Create 
pseudonym</property>
+                        <property name="use_action_appearance">False</property>
                         <property name="visible">True</property>
+                        <property name="can_focus">False</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="accel_path">&lt;gnunet-fs-gtk&gt;/File 
sharing/Create pseudonym</property>
                         <property name="use_underline">True</property>
                         <property name="image">new_stock_image</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"/>
+                        <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="use_action_appearance">False</property>
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="use_underline">True</property>
                         <property name="image">index_stock_image</property>
                         <property name="use_stock">False</property>
-                        <signal name="activate" 
handler="GNUNET_GTK_main_menu_file_advertise_pseudonym_activate_cb"/>
+                        <signal name="activate" 
handler="GNUNET_GTK_main_menu_file_advertise_pseudonym_activate_cb" 
swapped="no"/>
                       </object>
                     </child>
                     <child>
                       <object class="GtkMenuItem" 
id="GNUNET_GTK_main_menu_file_manage_pseudonyms">
+                        <property name="use_action_appearance">False</property>
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="tooltip_text" translatable="yes">Opens 
namespace manager dialog to adjust the list of namespaces you want to use, as 
well as get detailed information about all discovered namespaces.</property>
                         <property name="label" translatable="yes">_Manage 
namespaces</property>
                         <property name="use_underline">True</property>
-                        <signal name="activate" 
handler="GNUNET_GTK_main_menu_file_manage_pseudonyms_activate_cb"/>
+                        <signal name="activate" 
handler="GNUNET_GTK_main_menu_file_manage_pseudonyms_activate_cb" swapped="no"/>
                       </object>
                     </child>
                     <child>
                       <object class="GtkSeparatorMenuItem" 
id="GNUNET_GTK_main_menu_file_sep3">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                       </object>
                     </child>
                     <child>
                       <object class="GtkImageMenuItem" 
id="GNUNET_GTK_main_menu_file_quit">
                         <property name="label">gtk-quit</property>
+                        <property name="use_action_appearance">False</property>
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="tooltip_text" translatable="yes">Exit 
gnunet-fs-gtk.  Active file-sharing operations will resume upon 
restart.</property>
                         <property 
name="accel_path">&lt;gnunet-fs-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_FS_GTK_menu_quit_activate_cb"/>
+                        <signal name="activate" 
handler="GNUNET_FS_GTK_menu_quit_activate_cb" swapped="no"/>
                       </object>
                     </child>
                   </object>
@@ -290,15 +366,20 @@
             </child>
             <child>
               <object class="GtkMenuItem" id="GNUNET_GTK_main_menu_edit">
+                <property name="use_action_appearance">False</property>
+                <property name="can_focus">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>
+                    <property name="can_focus">False</property>
                     <child>
                       <object class="GtkImageMenuItem" 
id="GNUNET_GTK_main_menu_edit_preferences">
                         <property name="label">gtk-preferences</property>
+                        <property name="use_action_appearance">False</property>
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="tooltip_text" translatable="yes">Edit 
the system configuration.</property>
                         <property 
name="accel_path">&lt;gnunet-fs-gtk&gt;/Edit/Preferences</property>
                         <property name="use_underline">True</property>
@@ -311,40 +392,49 @@
             </child>
             <child>
               <object class="GtkMenuItem" id="GNUNET_GTK_main_menu_view">
+                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
+                <property name="can_focus">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>
+                    <property name="can_focus">False</property>
                     <child>
                       <object class="GtkCheckMenuItem" 
id="GNUNET_GTK_main_menu_view_metadata">
+                        <property name="use_action_appearance">False</property>
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="tooltip_text" translatable="yes">Show 
meta data in main window</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"/>
+                        <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_preview">
+                        <property name="use_action_appearance">False</property>
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="tooltip_text" translatable="yes">Show 
preview (when available)</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"/>
+                        <signal name="toggled" 
handler="GNUNET_GTK_main_menu_view_preview_toggled_cb" swapped="no"/>
                       </object>
                     </child>
                     <child>
                       <object class="GtkCheckMenuItem" 
id="GNUNET_GTK_main_menu_search_preview">
+                        <property name="use_action_appearance">False</property>
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="tooltip_text" translatable="yes">Show 
search box in main window</property>
                         <property name="label" 
translatable="yes">Search</property>
                         <property name="use_underline">True</property>
                         <property name="active">True</property>
-                        <signal name="toggled" 
handler="GNUNET_GTK_main_menu_view_search_toggled_cb"/>
+                        <signal name="toggled" 
handler="GNUNET_GTK_main_menu_view_search_toggled_cb" swapped="no"/>
                       </object>
                     </child>
                   </object>
@@ -353,21 +443,26 @@
             </child>
             <child>
               <object class="GtkMenuItem" id="GNUNET_GTK_main_menu_help">
+                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
+                <property name="can_focus">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>
+                    <property name="can_focus">False</property>
                     <child>
                       <object class="GtkImageMenuItem" 
id="GNUNET_GTK_main_menu_help_about">
                         <property name="label">gtk-about</property>
+                        <property name="use_action_appearance">False</property>
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="tooltip_text" 
translatable="yes">Display information about this version of 
gnunet-fs-gtk</property>
                         <property 
name="accel_path">&lt;gnunet-fs-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"/>
+                        <signal name="activate" 
handler="GNUNET_GTK_main_menu_help_about_activate_cb" swapped="no"/>
                       </object>
                     </child>
                   </object>
@@ -377,17 +472,20 @@
           </object>
           <packing>
             <property name="expand">False</property>
+            <property name="fill">True</property>
             <property name="position">1</property>
           </packing>
         </child>
         <child>
           <object class="GtkHBox" id="main_window_search_hbox">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
             <property name="border_width">3</property>
             <property name="spacing">4</property>
             <child>
               <object class="GtkLabel" id="main_window_search_namespace_label">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">Namespace:</property>
               </object>
               <packing>
@@ -399,6 +497,7 @@
             <child>
               <object class="GtkLabel" 
id="main_window_search_selected_namespace_label">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="label">&lt;none&gt;</property>
                 <property name="single_line_mode">True</property>
               </object>
@@ -411,23 +510,27 @@
             <child>
               <object class="GtkAlignment" 
id="main_window_search_namespace_combobox_alignment">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="xscale">0</property>
                 <property name="yscale">0</property>
                 <child>
                   <object class="GtkToggleButton" 
id="main_window_search_namespace_dropdown_button">
+                    <property name="use_action_appearance">False</property>
                     <property name="width_request">21</property>
                     <property name="height_request">21</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <property name="events">GDK_ENTER_NOTIFY_MASK | 
GDK_LEAVE_NOTIFY_MASK | GDK_STRUCTURE_MASK</property>
+                    <property name="use_action_appearance">False</property>
                     <property name="image_position">right</property>
-                    <signal name="leave_notify_event" 
handler="GNUNET_FS_GTK_search_namespace_selector_window_leave_notify_event_cb"/>
-                    <signal name="toggled" 
handler="GNUNET_FS_GTK_search_namespace_dropdown_button_toggled_cb"/>
-                    <signal name="enter_notify_event" 
handler="GNUNET_FS_GTK_search_namespace_dropdown_button_enter_notify_event_cb"/>
+                    <signal name="toggled" 
handler="GNUNET_FS_GTK_search_namespace_dropdown_button_toggled_cb" 
swapped="no"/>
+                    <signal name="leave-notify-event" 
handler="GNUNET_FS_GTK_search_namespace_selector_window_leave_notify_event_cb" 
swapped="no"/>
+                    <signal name="enter-notify-event" 
handler="GNUNET_FS_GTK_search_namespace_dropdown_button_enter_notify_event_cb" 
swapped="no"/>
                     <child>
                       <object class="GtkArrow" id="arrow1">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="arrow_type">down</property>
                       </object>
                     </child>
@@ -446,15 +549,18 @@
             <child>
               <object class="GtkAlignment" 
id="main_window_search_button_alignment">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="yscale">0</property>
                 <child>
                   <object class="GtkButton" id="main_window_search_button">
                     <property name="label" translatable="yes">Find:</property>
+                    <property name="use_action_appearance">False</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">find_stock_image</property>
-                    <signal name="clicked" 
handler="main_window_search_button_clicked_cb"/>
+                    <signal name="clicked" 
handler="main_window_search_button_clicked_cb" swapped="no"/>
                   </object>
                 </child>
               </object>
@@ -469,17 +575,20 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="has_focus">True</property>
-                <property name="invisible_char">&#x25CF;</property>
+                <property name="invisible_char">●</property>
                 <property name="invisible_char_set">True</property>
-                <signal name="key_press_event" 
handler="main_window_search_entry_key_press_event_cb"/>
+                <signal name="key-press-event" 
handler="main_window_search_entry_key_press_event_cb" swapped="no"/>
               </object>
               <packing>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
                 <property name="position">5</property>
               </packing>
             </child>
             <child>
               <object class="GtkLabel" id="main_window_search_anonymity_label">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">Anonymity:</property>
               </object>
               <packing>
@@ -491,10 +600,12 @@
             <child>
               <object class="GtkAlignment" 
id="main_window_search_anonymity_combobox_alignment">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="yscale">0</property>
                 <child>
                   <object class="GtkComboBox" 
id="main_window_search_anonymity_combobox">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="model">anonymity_level_liststore</property>
                     <property name="active">1</property>
                     <child>
@@ -522,6 +633,7 @@
             <child>
               <object class="GtkLabel" id="main_window_search_mime_label">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">Type:</property>
               </object>
               <packing>
@@ -533,10 +645,12 @@
             <child>
               <object class="GtkAlignment" 
id="main_window_search_mime_combobox_alignment">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="yscale">0</property>
                 <child>
                   <object class="GtkComboBox" 
id="main_window_search_mime_combobox">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property 
name="model">main_window_search_mime_liststore</property>
                     <property name="active">0</property>
                     <child>
@@ -600,7 +714,7 @@
                 <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"/>
+                <signal name="switch-page" 
handler="GNUNET_GTK_main_window_notebook_switch_page_cb" after="yes" 
swapped="no"/>
               </object>
               <packing>
                 <property name="resize">True</property>
@@ -610,11 +724,13 @@
             <child>
               <object class="GtkVBox" id="GNUNET_GTK_main_window_extras_vbox">
                 <property name="visible">True</property>
+                <property name="can_focus">False</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="can_focus">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>
@@ -636,14 +752,17 @@
                       <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="model">GNUNET_GTK_meta_data_list_store</property>
                         <property name="search_column">0</property>
                         <property name="rubber_banding">True</property>
                         <property name="enable_grid_lines">both</property>
-                        <signal name="button_press_event" 
handler="GNUNET_GTK_main_window_metadata_treeview_button_press_event_cb"/>
-                        <signal name="popup_menu" 
handler="GNUNET_GTK_main_window_metadata_treeview_popup_menu_cb"/>
+                        <signal name="button-press-event" 
handler="GNUNET_GTK_main_window_metadata_treeview_button_press_event_cb" 
swapped="no"/>
+                        <signal name="popup-menu" 
handler="GNUNET_GTK_main_window_metadata_treeview_popup_menu_cb" swapped="no"/>
+                        <child internal-child="selection">
+                          <object class="GtkTreeSelection" 
id="treeview-selection1"/>
+                        </child>
                         <child>
                           <object class="GtkTreeViewColumn" 
id="GNUNET_GTK_main_window_metadata_type_column">
                             <property name="sizing">autosize</property>
@@ -681,6 +800,8 @@
                     </child>
                   </object>
                   <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
                     <property name="position">1</property>
                   </packing>
                 </child>
@@ -692,83 +813,42 @@
             </child>
           </object>
           <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
             <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="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 class="GtkTreeStore" id="main_window_search_namespace_treestore">
+    <columns>
+      <!-- column-name Name -->
+      <column type="gchararray"/>
+      <!-- column-name Key -->
+      <column type="gpointer"/>
+      <!-- column-name Root -->
+      <column type="gchararray"/>
+      <!-- column-name Tooltip -->
+      <column type="gchararray"/>
+    </columns>
   </object>
-  <object class="GtkAdjustment" id="adjustment3">
-    <property name="upper">100</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">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>
-  </object>
-  <object class="GtkAdjustment" id="adjustment5">
-    <property name="upper">100</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">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>
-  </object>
-  <object class="GtkAdjustment" id="adjustment7">
-    <property name="upper">100</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">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>
-  </object>
-  <object class="GtkImage" id="down_stock_image">
-    <property name="visible">True</property>
-    <property name="stock">gtk-go-down</property>
-  </object>
-  <object class="GtkImage" id="find_stock_image">
-    <property name="visible">True</property>
-    <property name="stock">gtk-find</property>
-  </object>
-  <object class="GtkImage" id="index_stock_image">
-    <property name="visible">True</property>
-    <property name="stock">gtk-index</property>
-  </object>
   <object class="GtkMenu" id="metadata_popup_menu">
     <property name="visible">True</property>
+    <property name="can_focus">False</property>
     <child>
       <object class="GtkMenuItem" id="Copy selection">
+        <property name="use_action_appearance">False</property>
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="label" translatable="yes">Copy selection</property>
         <property name="use_underline">True</property>
-        <signal name="activate" 
handler="GNUNET_GTK_FS_metadata_copy_selection_activated"/>
+        <signal name="activate" 
handler="GNUNET_GTK_FS_metadata_copy_selection_activated" swapped="no"/>
       </object>
     </child>
   </object>
   <object class="GtkWindow" id="namespace_selector_window">
+    <property name="can_focus">False</property>
     <property name="events">GDK_LEAVE_NOTIFY_MASK | 
GDK_STRUCTURE_MASK</property>
     <property name="resizable">False</property>
     <property name="destroy_with_parent">True</property>
@@ -780,10 +860,11 @@
     <property name="deletable">False</property>
     <property name="transient_for">GNUNET_GTK_main_window</property>
     <property name="mnemonics_visible">False</property>
-    <signal name="leave_notify_event" 
handler="GNUNET_FS_GTK_search_namespace_selector_window_leave_notify_event_cb"/>
-    <signal name="enter_notify_event" 
handler="GNUNET_FS_GTK_search_namespace_dropdown_button_enter_notify_event_cb"/>
+    <signal name="leave-notify-event" 
handler="GNUNET_FS_GTK_search_namespace_selector_window_leave_notify_event_cb" 
swapped="no"/>
+    <signal name="enter-notify-event" 
handler="GNUNET_FS_GTK_search_namespace_dropdown_button_enter_notify_event_cb" 
swapped="no"/>
     <child>
       <object class="GtkVBox" id="namespace_selector_main_vbox">
+        <property name="can_focus">False</property>
         <child>
           <object class="GtkTreeView" id="namespace_selector_treeview">
             <property name="visible">True</property>
@@ -795,8 +876,11 @@
             <property name="hover_selection">True</property>
             <property name="hover_expand">True</property>
             <property name="tooltip_column">3</property>
-            <signal name="button_press_event" 
handler="GNUNET_FS_GTK_namespace_selector_treeview_button_press_event_cb"/>
-            <signal name="button_release_event" 
handler="GNUNET_FS_GTK_namespace_selector_treeview_button_release_event_cb"/>
+            <signal name="button-press-event" 
handler="GNUNET_FS_GTK_namespace_selector_treeview_button_press_event_cb" 
swapped="no"/>
+            <signal name="button-release-event" 
handler="GNUNET_FS_GTK_namespace_selector_treeview_button_release_event_cb" 
swapped="no"/>
+            <child internal-child="selection">
+              <object class="GtkTreeSelection" id="treeview-selection2"/>
+            </child>
             <child>
               <object class="GtkTreeViewColumn" id="name_column">
                 <property name="sizing">autosize</property>
@@ -823,17 +907,21 @@
             </child>
           </object>
           <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
             <property name="position">0</property>
           </packing>
         </child>
         <child>
           <object class="GtkButton" 
id="namespace_selector_manage_namespaces_button">
             <property name="label" translatable="yes">_Manage 
namespaces</property>
+            <property name="use_action_appearance">False</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>
-            <signal name="clicked" 
handler="namespace_selector_manage_namespaces_button_clicked_cb"/>
+            <signal name="clicked" 
handler="namespace_selector_manage_namespaces_button_clicked_cb" swapped="no"/>
           </object>
           <packing>
             <property name="expand">False</property>
@@ -846,16 +934,14 @@
   </object>
   <object class="GtkImage" id="new_stock_image">
     <property name="visible">True</property>
+    <property name="can_focus">False</property>
     <property name="stock">gtk-new</property>
   </object>
   <object class="GtkImage" id="open_stock_image">
     <property name="visible">True</property>
+    <property name="can_focus">False</property>
     <property name="stock">gtk-open</property>
   </object>
-  <object class="GtkImage" id="up_stock_image">
-    <property name="visible">True</property>
-    <property name="stock">gtk-go-up</property>
-  </object>
   <object class="GtkSizeGroup" id="enties_and_comboboxes_sizegroup">
     <property name="mode">vertical</property>
     <widgets>
@@ -870,8 +956,8 @@
     <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="upper">10000000</property>
     <property name="step_increment">1</property>
     <property name="page_increment">10</property>
   </object>
@@ -880,6 +966,11 @@
     <property name="step_increment">1</property>
     <property name="page_increment">10</property>
   </object>
+  <object class="GtkImage" id="up_stock_image">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="stock">gtk-go-up</property>
+  </object>
   <object class="GtkSizeGroup" id="sizegroup4"/>
   <object class="GtkSizeGroup" id="sizegroup5"/>
 </interface>

Modified: gnunet-gtk/contrib/gnunet_setup_gtk_main_window.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_setup_gtk_main_window.glade       2012-03-19 
08:27:11 UTC (rev 20594)
+++ gnunet-gtk/contrib/gnunet_setup_gtk_main_window.glade       2012-03-19 
08:46:17 UTC (rev 20595)
@@ -1,44 +1,22 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <requires lib="gtk+" version="2.20"/>
-  <!-- interface-naming-policy toplevel-contextual -->
   <object class="GtkAdjustment" id="GNUNET_setup_bandwidth_in_adjustment">
-    <property name="value">65536</property>
     <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="value">65536</property>
     <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="GtkListStore" id="GNUNET_setup_hostlist_url_liststore">
-    <columns>
-      <!-- column-name url -->
-      <column type="gchararray"/>
-      <!-- column-name editable -->
-      <column type="gboolean"/>
-    </columns>
-  </object>
-  <object class="GtkListStore" id="GNUNET_setup_gns_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>
   <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>
@@ -46,12 +24,70 @@
     <property name="default_height">550</property>
     <property name="icon_name">preferences-system</property>
     <property name="type_hint">dialog</property>
-    <signal name="destroy" handler="GNUNET_SETUP_quit_cb"/>
+    <signal name="destroy" handler="GNUNET_SETUP_quit_cb" swapped="no"/>
     <child internal-child="vbox">
-      <object class="GtkVBox" id="GNUNET_setup_dialog-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="use_action_appearance">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">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="GNUNET_setup_save_as_button">
+                <property name="label">gtk-save-as</property>
+                <property name="use_action_appearance">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>
+            <child>
+              <object class="GtkButton" id="GNUNET_setup_save_button">
+                <property name="label">gtk-save</property>
+                <property name="use_action_appearance">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">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>
@@ -59,22 +95,26 @@
             <child>
               <object class="GtkVBox" id="GNUNET_setup_general_vbox">
                 <property name="visible">True</property>
-                <property name="orientation">vertical</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>
@@ -87,11 +127,13 @@
                             <child>
                               <object class="GtkCheckButton" 
id="GNUNET_setup_general_services_topology_checkbutton">
                                 <property name="label" 
translatable="yes">Topology</property>
+                                <property 
name="use_action_appearance">False</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="tooltip_text" 
translatable="yes">The topology subsystem is required as it ensures that your 
peer connects to other peers.</property>
+                                <property 
name="use_action_appearance">False</property>
                                 <property name="xalign">0</property>
                                 <property name="active">True</property>
                                 <property name="draw_indicator">True</property>
@@ -106,10 +148,12 @@
                             <child>
                               <object class="GtkCheckButton" 
id="GNUNET_setup_general_services_hostlist_checkbutton">
                                 <property name="label" 
translatable="yes">Hostlist</property>
+                                <property 
name="use_action_appearance">False</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property 
name="receives_default">False</property>
                                 <property name="tooltip_text" 
translatable="yes">Hostlist servers are used to find other peers.  Here you can 
choose to offer a hostlist or simply configure which hostlists by other peers 
you want to use.</property>
+                                <property 
name="use_action_appearance">False</property>
                                 <property name="xalign">0</property>
                                 <property name="active">True</property>
                                 <property name="draw_indicator">True</property>
@@ -124,10 +168,12 @@
                             <child>
                               <object class="GtkCheckButton" 
id="GNUNET_setup_general_services_fs_checkbutton">
                                 <property name="label" translatable="yes">File 
_Sharing</property>
+                                <property 
name="use_action_appearance">False</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property 
name="receives_default">False</property>
                                 <property name="tooltip_text" 
translatable="yes">Enable GNUnet's file-sharing subsystem.</property>
+                                <property 
name="use_action_appearance">False</property>
                                 <property name="use_underline">True</property>
                                 <property name="xalign">0</property>
                                 <property name="active">True</property>
@@ -143,16 +189,19 @@
                             <child>
                               <object class="GtkCheckButton" 
id="GNUNET_setup_general_services_pt_checkbutton">
                                 <property name="label" 
translatable="yes">PT/VPN</property>
+                                <property 
name="use_action_appearance">False</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property 
name="receives_default">False</property>
                                 <property name="tooltip_text" 
translatable="yes">Using the PT/VPN subsystems you can tunnel your Internet 
traffic over GNUnet.  This is useful if you want to access the IPv4-Internet if 
you only have IPv6-connectivity or vice versa.  Furthermore, if you are only 
connected to other peers using WLAN, you could also get Internet access in the 
first place by routing IP traffic over GNUnet.</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="padding">5</property>
                                 <property name="position">4</property>
                               </packing>
@@ -160,16 +209,19 @@
                             <child>
                               <object class="GtkCheckButton" 
id="GNUNET_setup_general_services_exit_checkbutton">
                                 <property name="label" 
translatable="yes">EXIT</property>
+                                <property 
name="use_action_appearance">False</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property 
name="receives_default">False</property>
                                 <property name="tooltip_text" 
translatable="yes">By offering an EXIT service, you can allow other peers to 
use your Internet connection to reach the IPv4 and/or IPv6 Internet.  
Naturally, as your machine will be seen as the origin of the traffic, this 
might be risky in some jurisdictions.  Enabling the exit for IPv4 and IPv6 and 
PT/VPN interception for IPv4 and IPv6 on the same machine will still give you 
4to6 and 6to4 protocol translation, allowing you to access IPv4-only servers 
from IPv6-only clients and IPv6-only servers from IPv4-only clients.</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="padding">5</property>
                                 <property name="position">5</property>
                               </packing>
@@ -177,15 +229,18 @@
                             <child>
                               <object class="GtkCheckButton" 
id="GNUNET_setup_general_services_gns_checkbutton">
                                 <property name="label" 
translatable="yes">GNS</property>
+                                <property 
name="use_action_appearance">False</property>
                                 <property name="can_focus">True</property>
                                 <property 
name="receives_default">False</property>
                                 <property name="tooltip_text" 
translatable="yes">The GNS is GNUnet's replacement for DNS.  Enabling this 
subsystem will make the ".gnunet" TLD available on your system.  You will be in 
charge of your ".gnunet" TLD.</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="padding">5</property>
                                 <property name="position">6</property>
                               </packing>
@@ -197,6 +252,7 @@
                     <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>
@@ -212,21 +268,26 @@
                 <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="use_action_appearance">False</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>
@@ -240,9 +301,11 @@
                             <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>
@@ -250,6 +313,7 @@
                             <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>
@@ -261,17 +325,22 @@
                             <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>
@@ -279,6 +348,7 @@
                             <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>
@@ -291,10 +361,8 @@
                               <object class="GtkSpinButton" 
id="GNUNET_setup_minimum_friends_spinbutton">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
-                                <property 
name="invisible_char">&#x2022;</property>
+                                <property name="invisible_char">•</property>
                                 <property 
name="invisible_char_set">True</property>
-                                <property 
name="primary_icon_sensitive">True</property>
-                                <property 
name="secondary_icon_sensitive">True</property>
                                 <property 
name="adjustment">GNUNET_setup_min_friends_adjustment</property>
                                 <property name="numeric">True</property>
                               </object>
@@ -311,6 +379,7 @@
                     <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>
@@ -326,25 +395,30 @@
                 <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="orientation">vertical</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="use_action_appearance">False</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>
@@ -358,9 +432,11 @@
                                 <child>
                                   <object class="GtkCheckButton" 
id="GNUNET_setup_hostlist_client_learn_checkbutton">
                                     <property name="label" 
translatable="yes">Learn Servers from P2P Network</property>
+                                    <property 
name="use_action_appearance">False</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>
@@ -381,19 +457,22 @@
                             <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="orientation">vertical</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="use_action_appearance">False</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>
-                                        <signal name="realize" 
handler="GNUNET_setup_hostlist_offer_hostlist_checkbutton_realize_cb"/>
+                                        <signal name="realize" 
handler="GNUNET_setup_hostlist_offer_hostlist_checkbutton_realize_cb" 
swapped="no"/>
                                       </object>
                                       <packing>
                                         <property 
name="expand">False</property>
@@ -404,12 +483,14 @@
                                     <child>
                                       <object class="GtkCheckButton" 
id="GNUNET_setup_hostlist_advertise_checkbutton">
                                         <property name="label" 
translatable="yes">Advertise Hostlist Server</property>
+                                        <property 
name="use_action_appearance">False</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>
-                                        <signal name="realize" 
handler="GNUNET_setup_hostlist_advertise_checkbutton_realize_cb"/>
+                                        <signal name="realize" 
handler="GNUNET_setup_hostlist_advertise_checkbutton_realize_cb" swapped="no"/>
                                       </object>
                                       <packing>
                                         <property 
name="expand">False</property>
@@ -420,9 +501,11 @@
                                     <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>
@@ -436,13 +519,11 @@
                                           <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">&#x2022;</property>
+                                            <property 
name="invisible_char">•</property>
                                             <property 
name="invisible_char_set">True</property>
-                                            <property 
name="primary_icon_sensitive">True</property>
-                                            <property 
name="secondary_icon_sensitive">True</property>
                                             <property 
name="adjustment">GNUNET_setup_hostlist_server_port_adjustment</property>
                                             <property 
name="numeric">True</property>
-                                            <signal name="realize" 
handler="GNUNET_setup_hostlist_server_port_spin_button_realize_cb"/>
+                                            <signal name="realize" 
handler="GNUNET_setup_hostlist_server_port_spin_button_realize_cb" 
swapped="no"/>
                                           </object>
                                           <packing>
                                             <property 
name="expand">False</property>
@@ -469,10 +550,11 @@
                                 <child>
                                   <object class="GtkVBox" 
id="GNUNET_setup_hostlist_vbox ">
                                     <property name="visible">True</property>
-                                    <property 
name="orientation">vertical</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>
@@ -493,24 +575,29 @@
                                           <object class="GtkTreeView" 
id="GNUNET_setup_hostlist_url_treeview">
                                             <property 
name="visible">True</property>
                                             <property 
name="can_focus">True</property>
-                                            <property 
name="model">GNUNET_setup_hostlist_url_liststore</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"/>
+                                            <signal name="key-press-event" 
handler="GNUNET_setup_treeview_key_press_event_cb" swapped="no"/>
+                                            <child internal-child="selection">
+                                              <object class="GtkTreeSelection" 
id="treeview-selection1"/>
+                                            </child>
                                             <child>
                                               <object 
class="GtkTreeViewColumn" id="GNUNET_setup_hostlist_url_treeviewcolumn">
+                                                <property 
name="sizing">fixed</property>
                                                 <property 
name="title">URL</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_setup_hostlist_url_cellrenderertext">
-                                                    <signal name="edited" 
handler="GNUNET_setup_hostlist_url_cellrenderertext_edited_cb"/>
+                                                    <property 
name="editable">True</property>
+                                                    <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>
@@ -520,16 +607,22 @@
                                         </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>
@@ -540,12 +633,15 @@
                     <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>
@@ -555,6 +651,7 @@
             <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>
@@ -565,26 +662,30 @@
             <child>
               <object class="GtkVBox" id="GNUNET_setup_network_tab_vbox">
                 <property name="visible">True</property>
-                <property name="orientation">vertical</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="orientation">vertical</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>
@@ -598,10 +699,8 @@
                                   <object class="GtkSpinButton" 
id="GNUNET_setup_bandwidth_in_spinbutton">
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
-                                    <property 
name="invisible_char">&#x2022;</property>
+                                    <property 
name="invisible_char">•</property>
                                     <property 
name="invisible_char_set">True</property>
-                                    <property 
name="primary_icon_sensitive">True</property>
-                                    <property 
name="secondary_icon_sensitive">True</property>
                                     <property 
name="adjustment">GNUNET_setup_bandwidth_in_adjustment</property>
                                     <property name="numeric">True</property>
                                   </object>
@@ -614,9 +713,12 @@
                                 <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>
@@ -624,14 +726,14 @@
                                   <object class="GtkSpinButton" 
id="GNUNET_setup_bandwidth_out_spinbutton">
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
-                                    <property 
name="invisible_char">&#x2022;</property>
+                                    <property 
name="invisible_char">•</property>
                                     <property 
name="invisible_char_set">True</property>
-                                    <property 
name="primary_icon_sensitive">True</property>
-                                    <property 
name="secondary_icon_sensitive">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>
@@ -649,6 +751,7 @@
                     <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>
@@ -663,26 +766,31 @@
                 <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="orientation">vertical</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="use_action_appearance">False</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>
@@ -697,10 +805,12 @@
                                 <child>
                                   <object class="GtkButton" 
id="GNUNET_setup_transport_autoconfig_button">
                                     <property name="label" 
translatable="yes">Attempt automatic configuration</property>
+                                    <property 
name="use_action_appearance">False</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property 
name="receives_default">True</property>
-                                    <signal name="clicked" 
handler="GNUNET_setup_transport_autoconfig_button_clicked_cb"/>
+                                    <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>
@@ -712,10 +822,12 @@
                                 <child>
                                   <object class="GtkCheckButton" 
id="GNUNET_setup_transport_disable_ipv6_checkbutton">
                                     <property name="label" 
translatable="yes">Disable IPv_6 support</property>
+                                    <property 
name="use_action_appearance">False</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>
@@ -738,10 +850,12 @@
                             <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>
@@ -753,29 +867,34 @@
                                 <child>
                                   <object class="GtkVBox" 
id="GNUNET_setup_transport_nat_options_vbox">
                                     <property name="visible">True</property>
-                                    <property 
name="orientation">vertical</property>
+                                    <property name="can_focus">False</property>
                                     <child>
                                       <object class="GtkCheckButton" 
id="GNUNET_setup_transport_hole_punched_checkbutton">
                                         <property name="label" 
translatable="yes">NAT ports have been opened manually</property>
+                                        <property 
name="use_action_appearance">False</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="use_action_appearance">False</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>
@@ -788,10 +907,12 @@
                                     <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="use_action_appearance">False</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>
@@ -804,9 +925,11 @@
                                     <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>
@@ -822,12 +945,12 @@
                                             <property 
name="visible">True</property>
                                             <property 
name="can_focus">True</property>
                                             <property 
name="max_length">255</property>
-                                            <property 
name="invisible_char">&#x25CF;</property>
+                                            <property 
name="invisible_char">●</property>
                                             <property 
name="invisible_char_set">True</property>
-                                            <property 
name="primary_icon_sensitive">True</property>
-                                            <property 
name="secondary_icon_sensitive">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>
@@ -842,10 +965,12 @@
                                     <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="use_action_appearance">False</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>
@@ -859,9 +984,11 @@
                                     <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>
@@ -877,22 +1004,26 @@
                                             <property 
name="visible">True</property>
                                             <property 
name="can_focus">True</property>
                                             <property 
name="max_length">15</property>
-                                            <property 
name="invisible_char">&#x25CF;</property>
+                                            <property 
name="invisible_char">●</property>
                                             <property 
name="width_chars">15</property>
-                                            <property 
name="primary_icon_sensitive">True</property>
-                                            <property 
name="secondary_icon_sensitive">True</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>
@@ -911,12 +1042,15 @@
                     <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>
@@ -929,6 +1063,7 @@
             <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>
@@ -940,23 +1075,27 @@
             <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="orientation">vertical</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>
@@ -969,14 +1108,16 @@
                             <child>
                               <object class="GtkCheckButton" 
id="GNUNET_setup_transport_tcp_checkbutton">
                                 <property name="label" 
translatable="yes">_TCP</property>
+                                <property 
name="use_action_appearance">False</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"/>
+                                <signal name="realize" 
handler="GNUNET_setup_transport_tcp_checkbutton_realize_cb" swapped="no"/>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -988,13 +1129,15 @@
                             <child>
                               <object class="GtkCheckButton" 
id="GNUNET_setup_transport_udp_checkbutton">
                                 <property name="label" 
translatable="yes">_UDP</property>
+                                <property 
name="use_action_appearance">False</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"/>
+                                <signal name="realize" 
handler="GNUNET_setup_transport_udp_checkbutton_realize_cb" swapped="no"/>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -1006,14 +1149,16 @@
                             <child>
                               <object class="GtkCheckButton" 
id="GNUNET_setup_transport_http_checkbutton">
                                 <property name="label" 
translatable="yes">_HTTP</property>
+                                <property 
name="use_action_appearance">False</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"/>
+                                <signal name="realize" 
handler="GNUNET_setup_transport_http_checkbutton_realize_cb" swapped="no"/>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -1025,14 +1170,16 @@
                             <child>
                               <object class="GtkCheckButton" 
id="GNUNET_setup_transport_https_checkbutton">
                                 <property name="label" 
translatable="yes">HTTP_S</property>
+                                <property 
name="use_action_appearance">False</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"/>
+                                <signal name="realize" 
handler="GNUNET_setup_transport_https_checkbutton_realize_cb" swapped="no"/>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -1044,12 +1191,14 @@
                             <child>
                               <object class="GtkCheckButton" 
id="GNUNET_setup_transport_dv_checkbutton">
                                 <property name="label" 
translatable="yes">D_V</property>
+                                <property 
name="use_action_appearance">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="xalign">0</property>
                                 <property name="draw_indicator">True</property>
-                                <signal name="realize" 
handler="GNUNET_setup_transport_dv_checkbutton_realize_cb"/>
+                                <signal name="realize" 
handler="GNUNET_setup_transport_dv_checkbutton_realize_cb" swapped="no"/>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -1061,13 +1210,15 @@
                             <child>
                               <object class="GtkCheckButton" 
id="GNUNET_setup_transport_wlan_checkbutton">
                                 <property name="label" 
translatable="yes">_WLAN</property>
+                                <property 
name="use_action_appearance">False</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"/>
+                                <signal name="realize" 
handler="GNUNET_setup_transport_wlan_checkbutton_realize_cb" swapped="no"/>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -1090,14 +1241,16 @@
                             <child>
                               <object class="GtkVBox" 
id="GNUNET_setup_transport_tcp_vbox">
                                 <property name="visible">True</property>
-                                <property 
name="orientation">vertical</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>
@@ -1112,10 +1265,8 @@
                                         <property 
name="visible">True</property>
                                         <property 
name="can_focus">True</property>
                                         <property 
name="max_length">5</property>
-                                        <property 
name="invisible_char">&#x2022;</property>
+                                        <property 
name="invisible_char">•</property>
                                         <property 
name="invisible_char_set">True</property>
-                                        <property 
name="primary_icon_sensitive">True</property>
-                                        <property 
name="secondary_icon_sensitive">True</property>
                                         <property 
name="adjustment">GNUNET_setup_transport_tcp_port_adjustment</property>
                                         <property 
name="numeric">True</property>
                                       </object>
@@ -1129,6 +1280,7 @@
                                     <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>
@@ -1149,9 +1301,11 @@
                                 <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>
@@ -1166,10 +1320,8 @@
                                         <property 
name="visible">True</property>
                                         <property 
name="can_focus">True</property>
                                         <property 
name="max_length">5</property>
-                                        <property 
name="invisible_char">&#x25CF;</property>
+                                        <property 
name="invisible_char">●</property>
                                         <property 
name="invisible_char_set">True</property>
-                                        <property 
name="primary_icon_sensitive">True</property>
-                                        <property 
name="secondary_icon_sensitive">True</property>
                                         <property 
name="adjustment">GNUNET_setup_transport_tcp_adv_port_adjustment</property>
                                         <property 
name="numeric">True</property>
                                       </object>
@@ -1183,6 +1335,7 @@
                                     <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>
@@ -1202,22 +1355,28 @@
                                 <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="use_action_appearance">False</property>
                                         <property 
name="visible">True</property>
                                         <property 
name="can_focus">True</property>
                                         <property 
name="receives_default">True</property>
                                         <property name="tooltip_text" 
translatable="yes">Test your network configuration by contacting a public 
gnunet-nat-server and asking it to establish a connection to your system for 
testing.  This test can only work if you are not running your peer at the time 
you run the test.</property>
-                                        <signal name="clicked" 
handler="GNUNET_setup_transport_tcp_test_button_clicked_cb"/>
+                                        <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>
@@ -1228,6 +1387,7 @@
                                     </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>
@@ -1240,6 +1400,7 @@
                                     </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>
@@ -1253,8 +1414,11 @@
                                     <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>
@@ -1271,6 +1435,7 @@
                             <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>
@@ -1280,14 +1445,16 @@
                             <child>
                               <object class="GtkVBox" 
id="GNUNET_setup_transport_udp_vbox">
                                 <property name="visible">True</property>
-                                <property 
name="orientation">vertical</property>
+                                <property name="can_focus">False</property>
                                 <child>
                                   <object class="GtkHBox" 
id="GNUNET_setup_transport_udp_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_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>
@@ -1303,10 +1470,8 @@
                                         <property 
name="visible">True</property>
                                         <property 
name="can_focus">True</property>
                                         <property 
name="max_length">5</property>
-                                        <property 
name="invisible_char">&#x2022;</property>
+                                        <property 
name="invisible_char">•</property>
                                         <property 
name="invisible_char_set">True</property>
-                                        <property 
name="primary_icon_sensitive">True</property>
-                                        <property 
name="secondary_icon_sensitive">True</property>
                                         <property 
name="adjustment">GNUNET_setup_transport_udp_port_adjustment</property>
                                         <property 
name="numeric">True</property>
                                       </object>
@@ -1328,14 +1493,17 @@
                                 <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>
@@ -1344,14 +1512,13 @@
                                       <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">&#x25CF;</property>
-                                        <property 
name="primary_icon_sensitive">True</property>
-                                        <property 
name="secondary_icon_sensitive">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>
@@ -1359,6 +1526,7 @@
                                     <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>
@@ -1379,22 +1547,28 @@
                                 <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="use_action_appearance">False</property>
                                         <property 
name="visible">True</property>
                                         <property 
name="can_focus">True</property>
                                         <property 
name="receives_default">True</property>
                                         <property name="tooltip_text" 
translatable="yes">Test your network configuration by contacting a public 
gnunet-nat-server and asking it to establish a connection to your system for 
testing.  This test can only work if you are not running your peer at the time 
you run the test.</property>
-                                        <signal name="clicked" 
handler="GNUNET_setup_transport_udp_test_button_clicked_cb"/>
+                                        <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>
@@ -1405,6 +1579,7 @@
                                     </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>
@@ -1417,6 +1592,7 @@
                                     </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>
@@ -1430,8 +1606,11 @@
                                     <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>
@@ -1451,6 +1630,7 @@
                             <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>
@@ -1461,14 +1641,16 @@
                             <child>
                               <object class="GtkVBox" 
id="GNUNET_setup_transport_http_vbox">
                                 <property name="visible">True</property>
-                                <property 
name="orientation">vertical</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">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>
@@ -1486,10 +1668,8 @@
                                         <property 
name="visible">True</property>
                                         <property 
name="can_focus">True</property>
                                         <property 
name="max_length">5</property>
-                                        <property 
name="invisible_char">&#x2022;</property>
+                                        <property 
name="invisible_char">•</property>
                                         <property 
name="invisible_char_set">True</property>
-                                        <property 
name="primary_icon_sensitive">True</property>
-                                        <property 
name="secondary_icon_sensitive">True</property>
                                         <property 
name="adjustment">GNUNET_setup_transport_http_port_adjustment</property>
                                         <property 
name="numeric">True</property>
                                       </object>
@@ -1511,14 +1691,17 @@
                                 <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>
@@ -1528,15 +1711,14 @@
                                         <property 
name="visible">True</property>
                                         <property 
name="can_focus">True</property>
                                         <property 
name="max_length">5</property>
-                                        <property 
name="invisible_char">&#x25CF;</property>
+                                        <property 
name="invisible_char">●</property>
                                         <property 
name="invisible_char_set">True</property>
-                                        <property 
name="primary_icon_sensitive">True</property>
-                                        <property 
name="secondary_icon_sensitive">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>
@@ -1544,6 +1726,7 @@
                                     <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>
@@ -1564,22 +1747,28 @@
                                 <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="use_action_appearance">False</property>
                                         <property 
name="visible">True</property>
                                         <property 
name="can_focus">True</property>
                                         <property 
name="receives_default">True</property>
                                         <property name="tooltip_text" 
translatable="yes">Test your network configuration by contacting a public 
gnunet-nat-server and asking it to establish a connection to your system for 
testing.  This test can only work if you are not running your peer at the time 
you run the test.</property>
-                                        <signal name="clicked" 
handler="GNUNET_setup_transport_http_test_button_clicked_cb"/>
+                                        <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>
@@ -1590,6 +1779,7 @@
                                     </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>
@@ -1602,6 +1792,7 @@
                                     </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>
@@ -1615,8 +1806,11 @@
                                     <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>
@@ -1636,6 +1830,7 @@
                             <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>
@@ -1646,14 +1841,16 @@
                             <child>
                               <object class="GtkVBox" 
id="GNUNET_setup_transport_https_vbox">
                                 <property name="visible">True</property>
-                                <property 
name="orientation">vertical</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">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>
@@ -1671,10 +1868,8 @@
                                         <property 
name="visible">True</property>
                                         <property 
name="can_focus">True</property>
                                         <property 
name="max_length">5</property>
-                                        <property 
name="invisible_char">&#x2022;</property>
+                                        <property 
name="invisible_char">•</property>
                                         <property 
name="invisible_char_set">True</property>
-                                        <property 
name="primary_icon_sensitive">True</property>
-                                        <property 
name="secondary_icon_sensitive">True</property>
                                         <property 
name="adjustment">GNUNET_setup_transport_https_port_adjustment</property>
                                         <property 
name="numeric">True</property>
                                       </object>
@@ -1696,14 +1891,17 @@
                                 <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>
@@ -1713,15 +1911,14 @@
                                         <property 
name="visible">True</property>
                                         <property 
name="can_focus">True</property>
                                         <property 
name="max_length">5</property>
-                                        <property 
name="invisible_char">&#x25CF;</property>
+                                        <property 
name="invisible_char">●</property>
                                         <property 
name="invisible_char_set">True</property>
-                                        <property 
name="primary_icon_sensitive">True</property>
-                                        <property 
name="secondary_icon_sensitive">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>
@@ -1729,6 +1926,7 @@
                                     <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>
@@ -1749,22 +1947,28 @@
                                 <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="use_action_appearance">False</property>
                                         <property 
name="visible">True</property>
                                         <property 
name="can_focus">True</property>
                                         <property 
name="receives_default">True</property>
                                         <property name="tooltip_text" 
translatable="yes">Test your network configuration by contacting a public 
gnunet-nat-server and asking it to establish a connection to your system for 
testing.  This test can only work if you are not running your peer at the time 
you run the test.</property>
-                                        <signal name="clicked" 
handler="GNUNET_setup_transport_https_test_button_clicked_cb"/>
+                                        <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>
@@ -1775,6 +1979,7 @@
                                     </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>
@@ -1787,6 +1992,7 @@
                                     </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>
@@ -1800,8 +2006,11 @@
                                     <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>
@@ -1821,6 +2030,7 @@
                             <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>
@@ -1831,7 +2041,7 @@
                             <child>
                               <object class="GtkVBox" 
id="GNUNET_setup_transport_dv_vbox">
                                 <property name="visible">True</property>
-                                <property 
name="orientation">vertical</property>
+                                <property name="can_focus">False</property>
                                 <child>
                                   <placeholder/>
                                 </child>
@@ -1843,6 +2053,7 @@
                             <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>
@@ -1853,13 +2064,15 @@
                             <child>
                               <object class="GtkVBox" 
id="GNUNET_setup_transport_wlan_vbox">
                                 <property name="visible">True</property>
-                                <property 
name="orientation">vertical</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>
@@ -1875,10 +2088,8 @@
                                         <property 
name="visible">True</property>
                                         <property 
name="can_focus">True</property>
                                         <property 
name="max_length">255</property>
-                                        <property 
name="invisible_char">&#x25CF;</property>
+                                        <property 
name="invisible_char">●</property>
                                         <property 
name="invisible_char_set">True</property>
-                                        <property 
name="primary_icon_sensitive">True</property>
-                                        <property 
name="secondary_icon_sensitive">True</property>
                                       </object>
                                       <packing>
                                         <property 
name="expand">False</property>
@@ -1896,10 +2107,14 @@
                                   </packing>
                                 </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>
@@ -1909,6 +2124,8 @@
                             </child>
                           </object>
                           <packing>
+                            <property name="expand">True</property>
+                            <property name="fill">True</property>
                             <property name="position">1</property>
                           </packing>
                         </child>
@@ -1919,6 +2136,7 @@
                 <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>
@@ -1931,6 +2149,7 @@
             <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>
@@ -1942,25 +2161,30 @@
             <child>
               <object class="GtkVBox" id="GNUNET_setup_fs_main_vbox">
                 <property name="visible">True</property>
-                <property name="orientation">vertical</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="use_action_appearance">False</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>
@@ -1975,14 +2199,18 @@
                             <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="use_action_appearance">False</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>
@@ -1993,6 +2221,7 @@
                     <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>
@@ -2007,22 +2236,26 @@
                 <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="orientation">vertical</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>
@@ -2035,17 +2268,20 @@
                                 <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="use_action_appearance">False</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"/>
+                                        <signal name="realize" 
handler="GNUNET_setup_fs_datastore_sqlite_radiobutton_realize_cb" swapped="no"/>
                                       </object>
                                       <packing>
                                         <property 
name="expand">False</property>
@@ -2056,14 +2292,16 @@
                                     <child>
                                       <object class="GtkRadioButton" 
id="GNUNET_setup_fs_datastore_mysql_radiobutton">
                                         <property name="label" 
translatable="yes">MySQL</property>
+                                        <property 
name="use_action_appearance">False</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"/>
+                                        <signal name="realize" 
handler="GNUNET_setup_fs_datastore_mysql_radiobutton_realize_cb" swapped="no"/>
                                       </object>
                                       <packing>
                                         <property 
name="expand">False</property>
@@ -2074,13 +2312,15 @@
                                     <child>
                                       <object class="GtkRadioButton" 
id="GNUNET_setup_fs_datastore_postgres_radiobutton">
                                         <property name="label" 
translatable="yes">Postgres</property>
+                                        <property 
name="use_action_appearance">False</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"/>
+                                        <signal name="realize" 
handler="GNUNET_setup_fs_datastore_postgres_radiobutton_realize_cb" 
swapped="no"/>
                                       </object>
                                       <packing>
                                         <property 
name="expand">False</property>
@@ -2098,9 +2338,11 @@
                                 <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>
@@ -2108,6 +2350,7 @@
                                 <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>
@@ -2121,10 +2364,8 @@
                                   <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">&#x2022;</property>
+                                    <property 
name="invisible_char">•</property>
                                     <property 
name="invisible_char_set">True</property>
-                                    <property 
name="primary_icon_sensitive">True</property>
-                                    <property 
name="secondary_icon_sensitive">True</property>
                                     <property 
name="adjustment">GNUNET_setup_fs_datastore_quota_adjustment</property>
                                     <property name="numeric">True</property>
                                   </object>
@@ -2148,12 +2389,14 @@
                                 <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>
@@ -2163,13 +2406,15 @@
                                 <child>
                                   <object class="GtkVBox" 
id="GNUNET_setup_datastore_mysql_vbox">
                                     <property name="visible">True</property>
-                                    <property 
name="orientation">vertical</property>
+                                    <property name="can_focus">False</property>
                                     <child>
                                       <object class="GtkHBox" 
id="GNUNET_setup_datastore_mysql_database_name_hbox">
                                         <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>
@@ -2183,29 +2428,33 @@
                                           <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">&#x2022;</property>
+                                            <property 
name="invisible_char">•</property>
                                             <property name="text" 
translatable="yes">gnunet</property>
                                             <property 
name="invisible_char_set">True</property>
-                                            <property 
name="primary_icon_sensitive">True</property>
-                                            <property 
name="secondary_icon_sensitive">True</property>
-                                            <signal name="changed" 
handler="GNUNET_setup_datastore_mysql_invalidate_cb"/>
+                                            <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="GNUNET_setup_datastore_mysql_config_file_hbox">
                                         <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>
@@ -2217,23 +2466,30 @@
                                         <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="GNUNET_setup_datastore_mysql_username_password_hbox">
                                         <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>
@@ -2247,12 +2503,12 @@
                                           <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">&#x2022;</property>
+                                            <property 
name="invisible_char">•</property>
                                             <property 
name="invisible_char_set">True</property>
-                                            <property 
name="primary_icon_sensitive">True</property>
-                                            <property 
name="secondary_icon_sensitive">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>
@@ -2260,6 +2516,7 @@
                                         <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>
@@ -2272,27 +2529,31 @@
                                           <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">&#x2022;</property>
+                                            <property 
name="invisible_char">•</property>
                                             <property 
name="invisible_char_set">True</property>
-                                            <property 
name="primary_icon_sensitive">True</property>
-                                            <property 
name="secondary_icon_sensitive">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="GNUNET_setup_datastore_mysql_hostname_hbox">
                                         <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>
@@ -2306,13 +2567,13 @@
                                           <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">&#x2022;</property>
+                                            <property 
name="invisible_char">•</property>
                                             <property name="text" 
translatable="yes">localhost</property>
                                             <property 
name="invisible_char_set">True</property>
-                                            <property 
name="primary_icon_sensitive">True</property>
-                                            <property 
name="secondary_icon_sensitive">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>
@@ -2320,6 +2581,7 @@
                                         <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>
@@ -2333,13 +2595,11 @@
                                           <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">&#x2022;</property>
+                                            <property 
name="invisible_char">•</property>
                                             <property 
name="invisible_char_set">True</property>
-                                            <property 
name="primary_icon_sensitive">True</property>
-                                            <property 
name="secondary_icon_sensitive">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"/>
+                                            <signal name="value-changed" 
handler="GNUNET_setup_datastore_mysql_invalidate_cb" swapped="no"/>
                                           </object>
                                           <packing>
                                             <property 
name="expand">False</property>
@@ -2350,6 +2610,8 @@
                                         </child>
                                       </object>
                                       <packing>
+                                        <property name="expand">True</property>
+                                        <property name="fill">True</property>
                                         <property name="position">3</property>
                                       </packing>
                                     </child>
@@ -2361,43 +2623,57 @@
                                 <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="label" 
translatable="yes">Test configuration</property>
+                                        <property 
name="use_action_appearance">False</property>
                                         <property 
name="visible">True</property>
                                         <property 
name="can_focus">True</property>
                                         <property 
name="receives_default">True</property>
-                                        <signal name="clicked" 
handler="GNUNET_setup_datastore_mysql_tab_test_button_clicked_cb"/>
+                                        <property 
name="use_action_appearance">False</property>
+                                        <signal name="clicked" 
handler="GNUNET_setup_datastore_mysql_tab_test_button_clicked_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="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>
@@ -2410,13 +2686,16 @@
                                 <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>
@@ -2425,13 +2704,13 @@
                                       <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">&#x2022;</property>
+                                        <property 
name="invisible_char">•</property>
                                         <property 
name="invisible_char_set">True</property>
-                                        <property 
name="primary_icon_sensitive">True</property>
-                                        <property 
name="secondary_icon_sensitive">True</property>
-                                        <signal name="changed" 
handler="GNUNET_setup_datastore_postgres_invalidate_cb"/>
+                                        <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>
@@ -2444,43 +2723,57 @@
                                 <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="label" 
translatable="yes">Test configuration</property>
+                                        <property 
name="use_action_appearance">False</property>
                                         <property 
name="visible">True</property>
                                         <property 
name="can_focus">True</property>
                                         <property 
name="receives_default">True</property>
-                                        <signal name="clicked" 
handler="GNUNET_setup_datastore_postgres_tab_test_button_clicked_cb"/>
+                                        <property 
name="use_action_appearance">False</property>
+                                        <signal name="clicked" 
handler="GNUNET_setup_datastore_postgres_tab_test_button_clicked_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="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>
@@ -2492,6 +2785,8 @@
                                 </child>
                               </object>
                               <packing>
+                                <property name="expand">True</property>
+                                <property name="fill">True</property>
                                 <property name="position">1</property>
                               </packing>
                             </child>
@@ -2502,34 +2797,41 @@
                     <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="orientation">vertical</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>
@@ -2542,18 +2844,20 @@
                                 <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="use_action_appearance">False</property>
                                         <property 
name="visible">True</property>
                                         <property 
name="can_focus">True</property>
                                         <property 
name="receives_default">False</property>
-                                        <property 
name="use_action_appearance">True</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"/>
+                                        <signal name="realize" 
handler="GNUNET_setup_fs_datacache_sqlite_radiobutton_realize_cb" swapped="no"/>
                                       </object>
                                       <packing>
                                         <property 
name="expand">False</property>
@@ -2564,14 +2868,16 @@
                                     <child>
                                       <object class="GtkRadioButton" 
id="GNUNET_setup_fs_datacache_mysql_radiobutton">
                                         <property name="label" 
translatable="yes">MySQL</property>
+                                        <property 
name="use_action_appearance">False</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"/>
+                                        <signal name="realize" 
handler="GNUNET_setup_fs_datacache_mysql_radiobutton_realize_cb" swapped="no"/>
                                       </object>
                                       <packing>
                                         <property 
name="expand">False</property>
@@ -2582,13 +2888,15 @@
                                     <child>
                                       <object class="GtkRadioButton" 
id="GNUNET_setup_fs_datacache_postgres_radiobutton">
                                         <property name="label" 
translatable="yes">Postgres</property>
+                                        <property 
name="use_action_appearance">False</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"/>
+                                        <signal name="realize" 
handler="GNUNET_setup_fs_datacache_postgres_radiobutton_realize_cb" 
swapped="no"/>
                                       </object>
                                       <packing>
                                         <property 
name="expand">False</property>
@@ -2606,9 +2914,11 @@
                                 <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>
@@ -2616,6 +2926,7 @@
                                 <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>
@@ -2629,10 +2940,8 @@
                                   <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">&#x2022;</property>
+                                    <property 
name="invisible_char">•</property>
                                     <property 
name="invisible_char_set">True</property>
-                                    <property 
name="primary_icon_sensitive">True</property>
-                                    <property 
name="secondary_icon_sensitive">True</property>
                                     <property 
name="adjustment">GNUNET_setup_fs_datacache_quota_adjustment</property>
                                     <property name="numeric">True</property>
                                   </object>
@@ -2656,12 +2965,14 @@
                                 <child>
                                   <object class="GtkLabel" 
id="GNUNET_setup_fs_datacache_sqlite_body_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_fs_datacache_sqlite_tab_label">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="label" 
translatable="yes">sqLite</property>
                                   </object>
                                   <packing>
@@ -2671,13 +2982,15 @@
                                 <child>
                                   <object class="GtkVBox" 
id="GNUNET_setup_datacache_mysql_vbox">
                                     <property name="visible">True</property>
-                                    <property 
name="orientation">vertical</property>
+                                    <property name="can_focus">False</property>
                                     <child>
                                       <object class="GtkHBox" 
id="GNUNET_setup_datacache_mysql_database_name_hbox">
                                         <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>
@@ -2691,29 +3004,33 @@
                                           <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">&#x2022;</property>
+                                            <property 
name="invisible_char">•</property>
                                             <property name="text" 
translatable="yes">gnunet</property>
                                             <property 
name="invisible_char_set">True</property>
-                                            <property 
name="primary_icon_sensitive">True</property>
-                                            <property 
name="secondary_icon_sensitive">True</property>
-                                            <signal name="changed" 
handler="GNUNET_setup_datacache_mysql_invalidate_cb"/>
+                                            <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="GNUNET_setup_datacache_mysql_config_file_hbox">
                                         <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>
@@ -2725,24 +3042,31 @@
                                         <child>
                                           <object class="GtkFileChooserButton" 
id="GNUNET_setup_datacache_mysql_config_file_filechooserbutton">
                                             <property 
name="visible">True</property>
-                                            <signal name="file_set" 
handler="GNUNET_setup_datacache_mysql_invalidate_cb"/>
+                                            <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="GNUNET_setup_datacache_mysql_username_password_hbox">
                                         <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>
@@ -2756,13 +3080,13 @@
                                           <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">&#x2022;</property>
+                                            <property 
name="invisible_char">•</property>
                                             <property 
name="invisible_char_set">True</property>
-                                            <property 
name="primary_icon_sensitive">True</property>
-                                            <property 
name="secondary_icon_sensitive">True</property>
-                                            <signal name="changed" 
handler="GNUNET_setup_datacache_mysql_invalidate_cb"/>
+                                            <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>
@@ -2770,6 +3094,7 @@
                                         <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>
@@ -2782,28 +3107,32 @@
                                           <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">&#x2022;</property>
+                                            <property 
name="invisible_char">•</property>
                                             <property 
name="invisible_char_set">True</property>
-                                            <property 
name="primary_icon_sensitive">True</property>
-                                            <property 
name="secondary_icon_sensitive">True</property>
-                                            <signal name="changed" 
handler="GNUNET_setup_datacache_mysql_invalidate_cb"/>
+                                            <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="GNUNET_setup_datacache_mysql_hostname_hbox">
                                         <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>
@@ -2817,14 +3146,14 @@
                                           <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">&#x2022;</property>
+                                            <property 
name="invisible_char">•</property>
                                             <property name="text" 
translatable="yes">localhost</property>
                                             <property 
name="invisible_char_set">True</property>
-                                            <property 
name="primary_icon_sensitive">True</property>
-                                            <property 
name="secondary_icon_sensitive">True</property>
-                                            <signal name="changed" 
handler="GNUNET_setup_datacache_mysql_invalidate_cb"/>
+                                            <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>
@@ -2832,6 +3161,7 @@
                                         <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>
@@ -2845,13 +3175,11 @@
                                           <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">&#x2022;</property>
+                                            <property 
name="invisible_char">•</property>
                                             <property 
name="invisible_char_set">True</property>
-                                            <property 
name="primary_icon_sensitive">True</property>
-                                            <property 
name="secondary_icon_sensitive">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"/>
+                                            <signal name="value-changed" 
handler="GNUNET_setup_datacache_mysql_invalidate_cb" swapped="no"/>
                                           </object>
                                           <packing>
                                             <property 
name="expand">False</property>
@@ -2862,6 +3190,8 @@
                                         </child>
                                       </object>
                                       <packing>
+                                        <property name="expand">True</property>
+                                        <property name="fill">True</property>
                                         <property name="position">3</property>
                                       </packing>
                                     </child>
@@ -2873,44 +3203,57 @@
                                 <child type="tab">
                                   <object class="GtkHBox" 
id="GNUNET_setup_datacache_mysql_tab_hbox">
                                     <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="label" 
translatable="yes">Test configuration</property>
+                                        <property 
name="use_action_appearance">False</property>
                                         <property 
name="visible">True</property>
                                         <property 
name="can_focus">True</property>
                                         <property 
name="receives_default">True</property>
-                                        <signal name="clicked" 
handler="GNUNET_setup_datacache_mysql_tab_test_button_clicked_cb"/>
+                                        <property 
name="use_action_appearance">False</property>
+                                        <signal name="clicked" 
handler="GNUNET_setup_datacache_mysql_tab_test_button_clicked_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="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>
@@ -2923,13 +3266,16 @@
                                 <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>
@@ -2938,13 +3284,13 @@
                                       <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">&#x2022;</property>
+                                        <property 
name="invisible_char">•</property>
                                         <property 
name="invisible_char_set">True</property>
-                                        <property 
name="primary_icon_sensitive">True</property>
-                                        <property 
name="secondary_icon_sensitive">True</property>
-                                        <signal name="changed" 
handler="GNUNET_setup_datacache_postgres_invalidate_cb"/>
+                                        <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>
@@ -2958,43 +3304,57 @@
                                 <child type="tab">
                                   <object class="GtkHBox" 
id="GNUNET_setup_datacache_postgres_tab_hbox">
                                     <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="label" 
translatable="yes">Test configuration</property>
+                                        <property 
name="use_action_appearance">False</property>
                                         <property 
name="visible">True</property>
                                         <property 
name="can_focus">True</property>
                                         <property 
name="receives_default">True</property>
-                                        <signal name="clicked" 
handler="GNUNET_setup_datacache_postgres_tab_test_button_clicked_cb"/>
+                                        <property 
name="use_action_appearance">False</property>
+                                        <signal name="clicked" 
handler="GNUNET_setup_datacache_postgres_tab_test_button_clicked_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="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>
@@ -3007,6 +3367,7 @@
                               </object>
                               <packing>
                                 <property name="expand">False</property>
+                                <property name="fill">True</property>
                                 <property name="position">1</property>
                               </packing>
                             </child>
@@ -3017,12 +3378,15 @@
                     <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>
@@ -3034,6 +3398,7 @@
             <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>
@@ -3045,30 +3410,35 @@
             <child>
               <object class="GtkVBox" id="GNUNET_setup_vpn_vbox">
                 <property name="visible">True</property>
-                <property name="orientation">vertical</property>
+                <property name="can_focus">False</property>
                 <child>
                   <object class="GtkFrame" id="GNUNET_setup_pt_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_pt_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_pt_vbox">
                             <property name="visible">True</property>
-                            <property name="orientation">vertical</property>
+                            <property name="can_focus">False</property>
                             <child>
                               <object class="GtkHBox" 
id="GNUNET_setup_pt_hbox">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <child>
                                   <object class="GtkCheckButton" 
id="GNUNET_setup_pt_ipv4_checkbutton">
                                     <property name="label" 
translatable="yes">Tunnel IPv4 Traffic</property>
+                                    <property 
name="use_action_appearance">False</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property 
name="receives_default">False</property>
                                     <property name="tooltip_text" 
translatable="yes">By enabling this option, all of your IPv4-Internet traffic 
will be routed over GNUnet to a GNUnet exit node.  Note that this will enable 
other GNUnet peers to observe your unencrypted Internet traffic. This enables 
4over6 tunneling and 4to6 protocol translation.</property>
+                                    <property 
name="use_action_appearance">False</property>
                                     <property 
name="draw_indicator">True</property>
                                   </object>
                                   <packing>
@@ -3081,10 +3451,12 @@
                                 <child>
                                   <object class="GtkCheckButton" 
id="GNUNET_setup_pt_ipv6_checkbutton">
                                     <property name="label" 
translatable="yes">Tunnel IPv6 Traffic</property>
+                                    <property 
name="use_action_appearance">False</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property 
name="receives_default">False</property>
                                     <property name="tooltip_text" 
translatable="yes">By enabling this option, all of your IPv6-Internet traffic 
will be routed over GNUnet to a GNUnet exit node.  Note that this will enable 
other GNUnet peers to observe your unencrypted Internet traffic.  This enables 
6over4 tunneling and 6to4 protocol translation.</property>
+                                    <property 
name="use_action_appearance">False</property>
                                     <property 
name="draw_indicator">True</property>
                                   </object>
                                   <packing>
@@ -3097,10 +3469,12 @@
                                 <child>
                                   <object class="GtkCheckButton" 
id="GNUNET_setup_pt_dns_checkbutton">
                                     <property name="label" 
translatable="yes">Tunnel DNS Traffic</property>
+                                    <property 
name="use_action_appearance">False</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property 
name="receives_default">False</property>
                                     <property name="tooltip_text" 
translatable="yes">Enabling this option will cause your DNS traffic to be 
routed via the GNUnet network to some other peer offering DNS exit 
functionality. This is needed if you have no Internet access (and are thus 
tunnelling both IPv4 and IPv6 traffic over GNUnet).  If you have regular 
Internet access, this option only makes sense if you want to get some 'weak' 
anonymity by tunnelling all of your traffic over GNUnet (using the network as a 
1-hop proxy in the worst-case, so this does not provide you with strong 
anonymity).</property>
+                                    <property 
name="use_action_appearance">False</property>
                                     <property 
name="draw_indicator">True</property>
                                   </object>
                                   <packing>
@@ -3125,6 +3499,7 @@
                     <child type="label">
                       <object class="GtkLabel" id="GNUNET_setup_pt_label">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="label" 
translatable="yes">&lt;b&gt;Protocol Translation and Tunneling 
Configuration&lt;/b&gt;</property>
                         <property name="use_markup">True</property>
                       </object>
@@ -3140,26 +3515,31 @@
                 <child>
                   <object class="GtkFrame" 
id="GNUNET_setup_vpn_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_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__vbox">
                             <property name="visible">True</property>
-                            <property name="orientation">vertical</property>
+                            <property name="can_focus">False</property>
                             <child>
                               <object class="GtkHBox" 
id="GNUNET_setup_vpn_interface_hbox">
+                                <property name="can_focus">False</property>
                                 <child>
                                   <object class="GtkLabel" 
id="GNUNET_setup_vpn_interface_label">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="label" 
translatable="yes">_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>
@@ -3169,31 +3549,34 @@
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="tooltip_text" 
translatable="yes">Name of the TUN interface GNUnet will create for 
intercepting outgoing Internet traffic from your machine.  The default 
"gnunet-vpn" is almost always fine.</property>
-                                    <property 
name="invisible_char">&#x25CF;</property>
-                                    <property 
name="primary_icon_sensitive">True</property>
-                                    <property 
name="secondary_icon_sensitive">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_interface_v4_hbox">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <child>
                                   <object class="GtkLabel" 
id="GNUNET_setup_vpn_interface_v4_label">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="label" 
translatable="yes">IPv4 address for 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>
@@ -3202,22 +3585,23 @@
                                   <object class="GtkEntry" 
id="GNUNET_setup_vpn_interface_v4_ip_entry">
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
-                                    <property 
name="invisible_char">&#x25CF;</property>
-                                    <property 
name="primary_icon_sensitive">True</property>
-                                    <property 
name="secondary_icon_sensitive">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_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>
@@ -3225,31 +3609,34 @@
                                   <object class="GtkEntry" 
id="GNUNET_setup_vpn_interface_v4_mask_entry">
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
-                                    <property 
name="invisible_char">&#x25CF;</property>
-                                    <property 
name="primary_icon_sensitive">True</property>
-                                    <property 
name="secondary_icon_sensitive">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_interface_v6_hbox">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <child>
                                   <object class="GtkLabel" 
id="GNUNET_setup_vpn_interface_v6_label">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="label" 
translatable="yes">IPv6 address for 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>
@@ -3258,22 +3645,23 @@
                                   <object class="GtkEntry" 
id="GNUNET_setup_vpn_interface_v6_ip_entry">
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
-                                    <property 
name="invisible_char">&#x25CF;</property>
-                                    <property 
name="primary_icon_sensitive">True</property>
-                                    <property 
name="secondary_icon_sensitive">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_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>
@@ -3281,19 +3669,19 @@
                                   <object class="GtkSpinButton" 
id="GNUNET_setup_vpn_interface_v6_mask_spinbutton">
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
-                                    <property 
name="invisible_char">&#x25CF;</property>
-                                    <property 
name="primary_icon_sensitive">True</property>
-                                    <property 
name="secondary_icon_sensitive">True</property>
+                                    <property 
name="invisible_char">●</property>
                                     <property 
name="adjustment">GNUNET_setup_vpn_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>
@@ -3304,6 +3692,7 @@
                     <child type="label">
                       <object class="GtkLabel" 
id="GNUNET_setup_vpn_interface_configuration_frame_label">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="label" translatable="yes">&lt;b&gt;VPN 
Interface Configuration&lt;/b&gt;</property>
                         <property name="use_markup">True</property>
                       </object>
@@ -3311,6 +3700,7 @@
                   </object>
                   <packing>
                     <property name="expand">False</property>
+                    <property name="fill">True</property>
                     <property name="padding">5</property>
                     <property name="position">1</property>
                   </packing>
@@ -3323,6 +3713,7 @@
             <child type="tab">
               <object class="GtkLabel" id="GNUNET_setup_vpn_label">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="tooltip_text" translatable="yes">Configuration 
of the GNUnet VPN and the Protocol Translation (6to4, 4to6, 6over4, 4over6) 
facilities</property>
                 <property name="label" translatable="yes">_VPN</property>
                 <property name="use_underline">True</property>
@@ -3335,34 +3726,40 @@
             <child>
               <object class="GtkVBox" id="GNUNET_setup_exit_vbox">
                 <property name="visible">True</property>
-                <property name="orientation">vertical</property>
+                <property name="can_focus">False</property>
                 <child>
                   <object class="GtkFrame" id="GNUNET_setup_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_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_exit_frame_vbox">
                             <property name="visible">True</property>
-                            <property name="orientation">vertical</property>
+                            <property name="can_focus">False</property>
                             <child>
                               <object class="GtkHBox" 
id="GNUNET_setup_exit_master_hbox">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <child>
                                   <object class="GtkCheckButton" 
id="GNUNET_setup_dns_enable_exit_checkbutton">
                                     <property name="label" 
translatable="yes">Enable DNS Exit</property>
+                                    <property 
name="use_action_appearance">False</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>
@@ -3370,15 +3767,18 @@
                                 <child>
                                   <object class="GtkCheckButton" 
id="GNUNET_setup_exit_enable_ipv4_exit_checkbutton">
                                     <property name="label" 
translatable="yes">Enable IPv4 Exit</property>
+                                    <property 
name="use_action_appearance">False</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 will allow other peers to send IPv4 traffic to 
the Internet using your network connection.</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">1</property>
                                   </packing>
@@ -3386,15 +3786,18 @@
                                 <child>
                                   <object class="GtkCheckButton" 
id="GNUNET_setup_exit_enable_ipv6_exit_checkbutton">
                                     <property name="label" 
translatable="yes">Enable IPv6 Exit</property>
+                                    <property 
name="use_action_appearance">False</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 will allow other peers to send IPv6 traffic to 
the Internet using your network connection.  You should make sure that you have 
IPv6-support before enabling this option.</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">2</property>
                                   </packing>
@@ -3402,6 +3805,7 @@
                               </object>
                               <packing>
                                 <property name="expand">False</property>
+                                <property name="fill">True</property>
                                 <property name="padding">5</property>
                                 <property name="position">0</property>
                               </packing>
@@ -3409,13 +3813,16 @@
                             <child>
                               <object class="GtkHBox" 
id="GNUNET_setup_dns_resolver_hbox">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <child>
                                   <object class="GtkLabel" 
id="GNUNET_setup_dns_resolver_label">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="label" 
translatable="yes">IP Address of external DNS Resolver:</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
+                                    <property name="fill">True</property>
                                     <property name="padding">5</property>
                                     <property name="position">0</property>
                                   </packing>
@@ -3424,32 +3831,35 @@
                                   <object class="GtkEntry" 
id="GNUNET_setup_dns_resolver_ip_entry">
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
-                                    <property 
name="invisible_char">&#x25CF;</property>
-                                    <property 
name="primary_icon_sensitive">True</property>
-                                    <property 
name="secondary_icon_sensitive">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="padding">5</property>
                                 <property name="position">1</property>
                               </packing>
                             </child>
                             <child>
                               <object class="GtkHBox" 
id="GNUNET_setup_exit_frame_hbox">
+                                <property name="can_focus">False</property>
                                 <property name="spacing">5</property>
                                 <child>
                                   <object class="GtkLabel" 
id="GNUNET_setup_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>
@@ -3459,9 +3869,7 @@
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="tooltip_text" 
translatable="yes">Name of the TUN interface GNUnet will create for Internet 
traffic exiting GNUnet via your machine.  The default "gnunet-exit" is almost 
always fine.</property>
-                                    <property 
name="invisible_char">&#x25CF;</property>
-                                    <property 
name="primary_icon_sensitive">True</property>
-                                    <property 
name="secondary_icon_sensitive">True</property>
+                                    <property 
name="invisible_char">●</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
@@ -3480,13 +3888,16 @@
                             <child>
                               <object class="GtkHBox" 
id="GNUNET_setup_exit_ipv4_address_hbox">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <child>
                                   <object class="GtkLabel" 
id="GNUNET_setup_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>
@@ -3496,22 +3907,23 @@
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="tooltip_text" 
translatable="yes">Use a private IPv4 network here that does not conflict with 
your existing setup (i.e. something like 10.53.0.1/255.255.0.0 or 
192.168.0.1/255.255.0.0).  </property>
-                                    <property 
name="invisible_char">&#x25CF;</property>
-                                    <property 
name="primary_icon_sensitive">True</property>
-                                    <property 
name="secondary_icon_sensitive">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_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>
@@ -3519,18 +3931,18 @@
                                   <object class="GtkEntry" 
id="GNUNET_setup_exit_interface_v4_mask_entry">
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
-                                    <property 
name="invisible_char">&#x25CF;</property>
-                                    <property 
name="primary_icon_sensitive">True</property>
-                                    <property 
name="secondary_icon_sensitive">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="padding">5</property>
                                 <property name="position">3</property>
                               </packing>
@@ -3538,13 +3950,16 @@
                             <child>
                               <object class="GtkHBox" 
id="GNUNET_setup_exit_ipv6_address_hbox">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <child>
                                   <object class="GtkLabel" 
id="GNUNET_setup_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>
@@ -3554,22 +3969,23 @@
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="tooltip_text" 
translatable="yes">This should be a globally routed IPv6 subnet of your host.  
Alternatively, if your kernel supports IPv6-NAT, you can pick any site-local 
prefix and manually configure IPv6-NAT.</property>
-                                    <property 
name="invisible_char">&#x25CF;</property>
-                                    <property 
name="primary_icon_sensitive">True</property>
-                                    <property 
name="secondary_icon_sensitive">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_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>
@@ -3577,19 +3993,19 @@
                                   <object class="GtkSpinButton" 
id="GNUNET_setup_exit_interface_v6_mask_spinbutton">
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
-                                    <property 
name="invisible_char">&#x25CF;</property>
-                                    <property 
name="primary_icon_sensitive">True</property>
-                                    <property 
name="secondary_icon_sensitive">True</property>
+                                    <property 
name="invisible_char">●</property>
                                     <property 
name="adjustment">GNUNET_setup_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">4</property>
                               </packing>
                             </child>
@@ -3600,6 +4016,7 @@
                     <child type="label">
                       <object class="GtkLabel" 
id="GNUNET_setup_exit_frame_label">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="label" 
translatable="yes">&lt;b&gt;GNUnet Exit Configuration&lt;/b&gt;</property>
                         <property name="use_markup">True</property>
                       </object>
@@ -3607,6 +4024,7 @@
                   </object>
                   <packing>
                     <property name="expand">False</property>
+                    <property name="fill">True</property>
                     <property name="padding">5</property>
                     <property name="position">0</property>
                   </packing>
@@ -3619,6 +4037,7 @@
             <child type="tab">
               <object class="GtkLabel" id="GNUNET_setup_exit_label">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">_Exit</property>
                 <property name="use_underline">True</property>
               </object>
@@ -3629,30 +4048,34 @@
             </child>
             <child>
               <object class="GtkVBox" id="GNUNET_SETUP_gns_vbox">
-                <property name="orientation">vertical</property>
+                <property name="can_focus">False</property>
                 <child>
                   <object class="GtkVBox" id="vbox1">
                     <property name="visible">True</property>
-                    <property name="orientation">vertical</property>
+                    <property name="can_focus">False</property>
                     <child>
                       <object class="GtkFrame" 
id="GNUNET_setup_gns_basics_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_gns_basics_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_gns_basics_vbox">
                                 <property name="visible">True</property>
-                                <property 
name="orientation">vertical</property>
+                                <property name="can_focus">False</property>
                                 <child>
                                   <object class="GtkHBox" 
id="GNUNET_setup_gns_basics_hbox">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <child>
                                       <object class="GtkLabel" 
id="GNUNET_setup_gns_basics_preferred_name_label">
                                         <property 
name="visible">True</property>
+                                        <property 
name="can_focus">False</property>
                                         <property name="label" 
translatable="yes">_Preferred Name:</property>
                                         <property 
name="use_underline">True</property>
                                       </object>
@@ -3669,7 +4092,7 @@
                                         <property 
name="can_focus">True</property>
                                         <property name="tooltip_text" 
translatable="yes">This is the name you use for your own domain and the name 
that you would prefer others to use for you.  Picking a unique name is a good 
idea so that others will actually be able to use your unique name to reference 
your domain.</property>
                                         <property 
name="max_length">63</property>
-                                        <property 
name="invisible_char">&#x25CF;</property>
+                                        <property 
name="invisible_char">●</property>
                                       </object>
                                       <packing>
                                         <property 
name="expand">False</property>
@@ -3689,9 +4112,11 @@
                                 <child>
                                   <object class="GtkHBox" 
id="GNUNET_setup_gns_basics_identity_hbox">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <child>
                                       <object class="GtkLabel" 
id="GNUNET_setup_gns_basics_identity_label">
                                         <property 
name="visible">True</property>
+                                        <property 
name="can_focus">False</property>
                                         <property name="label" 
translatable="yes">Cryptographic Identity:</property>
                                       </object>
                                       <packing>
@@ -3704,10 +4129,12 @@
                                     <child>
                                       <object class="GtkLabel" 
id="GNUNET_setup_gns_basics_identity_value_label">
                                         <property 
name="visible">True</property>
+                                        <property 
name="can_focus">False</property>
                                         <property name="label">---set 
dynamically---</property>
                                       </object>
                                       <packing>
                                         <property 
name="expand">False</property>
+                                        <property name="fill">True</property>
                                         <property name="padding">5</property>
                                         <property name="position">1</property>
                                       </packing>
@@ -3715,10 +4142,12 @@
                                     <child>
                                       <object class="GtkButton" 
id="GNUNET_setup_gns_basics_copy_id_button">
                                         <property 
name="label">gtk-copy</property>
+                                        <property 
name="use_action_appearance">False</property>
                                         <property 
name="visible">True</property>
                                         <property 
name="can_focus">True</property>
                                         <property 
name="receives_default">True</property>
                                         <property name="tooltip_text" 
translatable="yes">This will copy the string that represents your cryptographic 
identity (your public key) to the clipboard.  This will allow you to share it 
out-of-band with other users.</property>
+                                        <property 
name="use_action_appearance">False</property>
                                         <property 
name="use_stock">True</property>
                                       </object>
                                       <packing>
@@ -3743,6 +4172,7 @@
                         <child type="label">
                           <object class="GtkLabel" 
id="GNUNET_setup_gns_basics_label">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <property name="label" 
translatable="yes">&lt;b&gt;Domain Owner Information&lt;/b&gt;</property>
                             <property name="use_markup">True</property>
                           </object>
@@ -3758,22 +4188,24 @@
                     <child>
                       <object class="GtkFrame" 
id="GNUNET_setup_gns_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_gns_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_gns_scrolledwindow">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property 
name="hscrollbar_policy">never</property>
-                                <property 
name="vscrollbar_policy">automatic</property>
                                 <property name="shadow_type">in</property>
                                 <child>
                                   <object class="GtkViewport" 
id="GNUNET_setup_gns_viewport">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property 
name="resize_mode">queue</property>
                                     <child>
                                       <object class="GtkTreeView" 
id="GNUNET_setup_gns_treeview">
@@ -3782,6 +4214,9 @@
                                         <property 
name="model">GNUNET_setup_gns_liststore</property>
                                         <property 
name="headers_clickable">False</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_gns_name_treeviewcolumn">
                                             <property 
name="sizing">autosize</property>
@@ -3858,18 +4293,23 @@
                         <child type="label">
                           <object class="GtkLabel" 
id="GNUNET_setup_gns_configuration_frame_label">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <property name="label" 
translatable="yes">&lt;b&gt;GNS Database&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="expand">True</property>
+                    <property name="fill">True</property>
                     <property name="position">0</property>
                   </packing>
                 </child>
@@ -3881,6 +4321,7 @@
             <child type="tab">
               <object class="GtkLabel" id="GNUNET_SETUP_gns_label">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">GN_S</property>
                 <property name="use_underline">True</property>
               </object>
@@ -3891,73 +4332,29 @@
             </child>
           </object>
           <packing>
+            <property name="expand">False</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="use_action_appearance">False</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>
-        <child internal-child="action_area">
-          <object class="GtkHButtonBox" id="GNUNET_setup_dialog-action_area">
-            <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_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_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_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="pack_type">end</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
       </object>
     </child>
     <action-widgets>
@@ -3966,112 +4363,134 @@
       <action-widget response="-3">GNUNET_setup_save_button</action-widget>
     </action-widgets>
   </object>
+  <object class="GtkAdjustment" 
id="GNUNET_setup_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_setup_fs_datacache_mysql_port_adjustment">
-    <property name="value">3306</property>
     <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="value">1024000</property>
     <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="value">3306</property>
     <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="value">100000000</property>
     <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="GtkListStore" id="GNUNET_setup_gns_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>
   <object class="GtkAdjustment" 
id="GNUNET_setup_hostlist_server_port_adjustment">
-    <property name="value">8080</property>
     <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="value">1080</property>
     <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="value">1080</property>
     <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="value">443</property>
     <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="value">443</property>
     <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="value">2086</property>
     <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="upper">65535</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="value">2086</property>
     <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="value">2086</property>
     <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_exit_interface_mask_adjustment">
-    <property name="value">48</property>
+  <object class="GtkAdjustment" 
id="GNUNET_setup_vpn_interface_mask_adjustment">
     <property name="lower">1</property>
     <property name="upper">127</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
-  </object>
-  <object class="GtkAdjustment" 
id="GNUNET_setup_vpn_interface_mask_adjustment">
     <property name="value">48</property>
-    <property name="lower">1</property>
-    <property name="upper">127</property>
     <property name="step_increment">1</property>
     <property name="page_increment">10</property>
   </object>

Modified: gnunet-gtk/src/lib/eventloop.c
===================================================================
--- gnunet-gtk/src/lib/eventloop.c      2012-03-19 08:27:11 UTC (rev 20594)
+++ gnunet-gtk/src/lib/eventloop.c      2012-03-19 08:46:17 UTC (rev 20595)
@@ -438,7 +438,7 @@
             {
               GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                           "Adding the pipe's 0x%x overlapped event to the 
array as %d\n",
-                          fh->h, nhandles);
+                          fh->h, fd_counter);
               ml->cached_poll_array[fd_counter].fd =
                   (intptr_t) fh->oOverlapRead->hEvent;
               /* On W32 .events makes no sense - g_poll will just OR its
@@ -464,7 +464,7 @@
           {
             GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                         "Adding the read ready event to the array as %d\n",
-                        nhandles);
+                        fd_counter);
             ml->cached_poll_array[fd_counter].fd =
                 (intptr_t) ml->hEventReadReady;
             ml->cached_poll_array[fd_counter].events = G_IO_IN;




reply via email to

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