gnunet-svn
[Top][All Lists]
Advanced

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

[GNUnet-SVN] r19313 - gnunet-gtk/contrib


From: gnunet
Subject: [GNUnet-SVN] r19313 - gnunet-gtk/contrib
Date: Sun, 22 Jan 2012 13:39:57 +0100

Author: grothoff
Date: 2012-01-22 13:39:57 +0100 (Sun, 22 Jan 2012)
New Revision: 19313

Modified:
   gnunet-gtk/contrib/gnunet_setup_gtk_main_window.glade
Log:
-only opening, fixing vboxes and saving in glade...

Modified: gnunet-gtk/contrib/gnunet_setup_gtk_main_window.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_setup_gtk_main_window.glade       2012-01-22 
12:06:45 UTC (rev 19312)
+++ gnunet-gtk/contrib/gnunet_setup_gtk_main_window.glade       2012-01-22 
12:39:57 UTC (rev 19313)
@@ -1,23 +1,44 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0"?>
 <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="vpn_dns_config_liststore">
+    <columns>
+      <!-- column-name hostname -->
+      <column type="gchararray"/>
+      <!-- column-name sourceport -->
+      <column type="guint"/>
+      <!-- column-name targetport -->
+      <column type="guint"/>
+      <!-- column-name targethostname -->
+      <column type="gchararray"/>
+      <!-- column-name isudp -->
+      <column type="gchararray"/>
+    </columns>
+  </object>
   <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>
@@ -25,66 +46,12 @@
     <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" swapped="no"/>
+    <signal name="destroy" handler="GNUNET_SETUP_quit_cb"/>
     <child internal-child="vbox">
       <object class="GtkVBox" 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="GtkHButtonBox" id="GNUNET_setup_dialog-action_area">
-            <property name="can_focus">False</property>
-            <property name="layout_style">end</property>
-            <child>
-              <object class="GtkButton" id="GNUNET_setup_cancel_button">
-                <property name="label">gtk-cancel</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
-                <property name="use_stock">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkButton" id="GNUNET_setup_save_as_button">
-                <property name="label">gtk-save-as</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
-                <property name="use_stock">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkButton" id="GNUNET_setup_save_button">
-                <property name="label">gtk-save</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
-                <property name="use_stock">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">2</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="pack_type">end</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
         <child>
           <object class="GtkNotebook" id="GNUNET_setup_notebook">
             <property name="visible">True</property>
@@ -92,26 +59,22 @@
             <child>
               <object class="GtkVBox" id="GNUNET_setup_general_vbox">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="orientation">vertical</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>
@@ -128,7 +91,6 @@
                                 <property name="sensitive">False</property>
                                 <property name="can_focus">True</property>
                                 <property 
name="receives_default">False</property>
-                                <property 
name="use_action_appearance">False</property>
                                 <property name="xalign">0</property>
                                 <property name="active">True</property>
                                 <property name="draw_indicator">True</property>
@@ -146,7 +108,6 @@
                                 <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>
@@ -164,7 +125,6 @@
                                 <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>
@@ -183,14 +143,12 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property 
name="receives_default">False</property>
-                                <property 
name="use_action_appearance">False</property>
                                 <property name="use_underline">True</property>
                                 <property name="xalign">0</property>
                                 <property name="draw_indicator">True</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
-                                <property name="fill">True</property>
                                 <property name="position">4</property>
                               </packing>
                             </child>
@@ -201,7 +159,6 @@
                     <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>
@@ -217,25 +174,21 @@
                 <child>
                   <object class="GtkFrame" id="GNUNET_setup_topology_frame">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <property name="label_xalign">0</property>
                     <property name="shadow_type">none</property>
                     <child>
                       <object class="GtkAlignment" 
id="GNUNET_setup_topology_alignment">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
                         <property name="left_padding">12</property>
                         <child>
                           <object class="GtkHBox" 
id="GNUNET_setup_topology_hbox">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
                             <child>
                               <object class="GtkCheckButton" 
id="GNUNET_setup_friends_only_checkbutton">
                                 <property name="label" translatable="yes">F_2F 
only</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property 
name="receives_default">False</property>
-                                <property 
name="use_action_appearance">False</property>
                                 <property name="use_underline">True</property>
                                 <property name="xalign">0</property>
                                 <property name="draw_indicator">True</property>
@@ -249,11 +202,9 @@
                             <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>
@@ -261,7 +212,6 @@
                             <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>
@@ -273,22 +223,17 @@
                             <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>
@@ -296,7 +241,6 @@
                             <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>
@@ -309,10 +253,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">•</property>
+                                <property 
name="invisible_char">&#x2022;</property>
                                 <property 
name="invisible_char_set">True</property>
-                                <property 
name="primary_icon_activatable">False</property>
-                                <property 
name="secondary_icon_activatable">False</property>
                                 <property 
name="primary_icon_sensitive">True</property>
                                 <property 
name="secondary_icon_sensitive">True</property>
                                 <property 
name="adjustment">GNUNET_setup_min_friends_adjustment</property>
@@ -331,7 +273,6 @@
                     <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>
@@ -347,29 +288,25 @@
                 <child>
                   <object class="GtkFrame" id="GNUNET_setup_hostlist_frame">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <property name="label_xalign">0</property>
                     <property name="shadow_type">none</property>
                     <child>
                       <object class="GtkAlignment" 
id="GNUNET_setup_hostlist_alignment">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
                         <property name="left_padding">12</property>
                         <child>
                           <object class="GtkVBox" 
id="GNUNET_setup_hostlist_vbox">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
+                            <property name="orientation">vertical</property>
                             <child>
                               <object class="GtkHBox" 
id="GNUNET_setup_hostlist_basics_hbox">
                                 <property name="visible">True</property>
-                                <property name="can_focus">False</property>
                                 <child>
                                   <object class="GtkCheckButton" 
id="GNUNET_setup_hostlist_client_enable_checkbutton">
                                     <property name="label" 
translatable="yes">Use Hostlists to bootstrap</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property 
name="receives_default">False</property>
-                                    <property 
name="use_action_appearance">False</property>
                                     <property name="xalign">0</property>
                                     <property 
name="draw_indicator">True</property>
                                   </object>
@@ -386,7 +323,6 @@
                                     <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>
@@ -407,21 +343,19 @@
                             <child>
                               <object class="GtkHBox" 
id="GNUNET_setup_hostlist_options_hbox">
                                 <property name="visible">True</property>
-                                <property name="can_focus">False</property>
                                 <child>
                                   <object class="GtkVBox" 
id="GNUNET_setup_hostlist_server_vbox">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
+                                    <property 
name="orientation">vertical</property>
                                     <child>
                                       <object class="GtkCheckButton" 
id="GNUNET_setup_hostlist_offer_hostlist_checkbutton">
                                         <property name="label" 
translatable="yes">Run Hostlist Server</property>
                                         <property 
name="visible">True</property>
                                         <property 
name="can_focus">True</property>
                                         <property 
name="receives_default">False</property>
-                                        <property 
name="use_action_appearance">False</property>
                                         <property name="xalign">0</property>
                                         <property 
name="draw_indicator">True</property>
-                                        <signal name="realize" 
handler="GNUNET_setup_hostlist_offer_hostlist_checkbutton_realize_cb" 
swapped="no"/>
+                                        <signal name="realize" 
handler="GNUNET_setup_hostlist_offer_hostlist_checkbutton_realize_cb"/>
                                       </object>
                                       <packing>
                                         <property 
name="expand">False</property>
@@ -435,10 +369,9 @@
                                         <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" swapped="no"/>
+                                        <signal name="realize" 
handler="GNUNET_setup_hostlist_advertise_checkbutton_realize_cb"/>
                                       </object>
                                       <packing>
                                         <property 
name="expand">False</property>
@@ -449,11 +382,9 @@
                                     <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>
@@ -467,15 +398,13 @@
                                           <object class="GtkSpinButton" 
id="GNUNET_setup_hostlist_server_port_spin_button">
                                             <property 
name="visible">True</property>
                                             <property 
name="can_focus">True</property>
-                                            <property 
name="invisible_char">•</property>
+                                            <property 
name="invisible_char">&#x2022;</property>
                                             <property 
name="invisible_char_set">True</property>
-                                            <property 
name="primary_icon_activatable">False</property>
-                                            <property 
name="secondary_icon_activatable">False</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" 
swapped="no"/>
+                                            <signal name="realize" 
handler="GNUNET_setup_hostlist_server_port_spin_button_realize_cb"/>
                                           </object>
                                           <packing>
                                             <property 
name="expand">False</property>
@@ -502,11 +431,10 @@
                                 <child>
                                   <object class="GtkVBox" 
id="GNUNET_setup_hostlist_vbox ">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
+                                    <property 
name="orientation">vertical</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>
@@ -531,17 +459,17 @@
                                             <property 
name="hadjustment">adjustment7</property>
                                             <property 
name="vadjustment">adjustment8</property>
                                             <property 
name="search_column">0</property>
-                                            <signal name="key-press-event" 
handler="GNUNET_setup_treeview_key_press_event_cb" swapped="no"/>
+                                            <signal name="key_press_event" 
handler="GNUNET_setup_treeview_key_press_event_cb"/>
                                             <child>
                                               <object 
class="GtkTreeViewColumn" id="GNUNET_setup_hostlist_url_treeviewcolumn">
-                                                <property name="title" 
translatable="yes">URL</property>
+                                                <property 
name="title">URL</property>
                                                 <property 
name="clickable">True</property>
                                                 <property 
name="reorderable">True</property>
                                                 <property 
name="sort_indicator">True</property>
                                                 <property 
name="sort_column_id">0</property>
                                                 <child>
                                                   <object 
class="GtkCellRendererText" id="GNUNET_setup_hostlist_url_cellrenderertext">
-                                                    <signal name="edited" 
handler="GNUNET_setup_hostlist_url_cellrenderertext_edited_cb" swapped="no"/>
+                                                    <signal name="edited" 
handler="GNUNET_setup_hostlist_url_cellrenderertext_edited_cb"/>
                                                   </object>
                                                   <attributes>
                                                     <attribute 
name="editable">1</attribute>
@@ -554,22 +482,16 @@
                                         </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>
@@ -580,15 +502,12 @@
                     <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>
@@ -598,7 +517,6 @@
             <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>
@@ -609,30 +527,26 @@
             <child>
               <object class="GtkVBox" id="GNUNET_setup_network_tab_vbox">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="orientation">vertical</property>
                 <child>
                   <object class="GtkFrame" id="GNUNET_setup_bandwidth_frame">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <property name="label_xalign">0</property>
                     <property name="shadow_type">none</property>
                     <child>
                       <object class="GtkAlignment" 
id="GNUNET_setup_bandwidth_alignment">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
                         <property name="left_padding">12</property>
                         <child>
                           <object class="GtkVBox" 
id="GNUNET_setup_bandwidth_vbox">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
+                            <property name="orientation">vertical</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>
@@ -646,10 +560,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">•</property>
+                                    <property 
name="invisible_char">&#x2022;</property>
                                     <property 
name="invisible_char_set">True</property>
-                                    <property 
name="primary_icon_activatable">False</property>
-                                    <property 
name="secondary_icon_activatable">False</property>
                                     <property 
name="primary_icon_sensitive">True</property>
                                     <property 
name="secondary_icon_sensitive">True</property>
                                     <property 
name="adjustment">GNUNET_setup_bandwidth_in_adjustment</property>
@@ -664,12 +576,9 @@
                                 <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>
@@ -677,18 +586,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">•</property>
+                                    <property 
name="invisible_char">&#x2022;</property>
                                     <property 
name="invisible_char_set">True</property>
-                                    <property 
name="primary_icon_activatable">False</property>
-                                    <property 
name="secondary_icon_activatable">False</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>
@@ -706,7 +611,6 @@
                     <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>
@@ -721,22 +625,19 @@
                 <child>
                   <object class="GtkFrame" 
id="GNUNET_setup_transport_nat_frame">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <property name="label_xalign">0</property>
                     <property name="shadow_type">none</property>
                     <child>
                       <object class="GtkAlignment" 
id="GNUNET_setup_transport_nat_alignment">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
                         <property name="left_padding">12</property>
                         <child>
                           <object class="GtkVBox" 
id="GNUNET_setup_transport_nat_vbox">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
+                            <property name="orientation">vertical</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>
@@ -744,7 +645,6 @@
                                     <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>
@@ -762,8 +662,7 @@
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property 
name="receives_default">True</property>
-                                    <property 
name="use_action_appearance">False</property>
-                                    <signal name="clicked" 
handler="GNUNET_setup_transport_autoconfig_button_clicked_cb" swapped="no"/>
+                                    <signal name="clicked" 
handler="GNUNET_setup_transport_autoconfig_button_clicked_cb"/>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
@@ -779,7 +678,6 @@
                                     <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>
@@ -802,12 +700,10 @@
                             <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>
@@ -819,7 +715,7 @@
                                 <child>
                                   <object class="GtkVBox" 
id="GNUNET_setup_transport_nat_options_vbox">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
+                                    <property 
name="orientation">vertical</property>
                                     <child>
                                       <object class="GtkCheckButton" 
id="GNUNET_setup_transport_hole_punched_checkbutton">
                                         <property name="label" 
translatable="yes">NAT ports have been opened manually</property>
@@ -827,13 +723,11 @@
                                         <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>
@@ -844,7 +738,6 @@
                                         <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>
@@ -861,7 +754,6 @@
                                         <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>
@@ -874,11 +766,9 @@
                                     <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>
@@ -894,16 +784,12 @@
                                             <property 
name="visible">True</property>
                                             <property 
name="can_focus">True</property>
                                             <property 
name="max_length">255</property>
-                                            <property 
name="invisible_char">●</property>
+                                            <property 
name="invisible_char">&#x25CF;</property>
                                             <property 
name="invisible_char_set">True</property>
-                                            <property 
name="primary_icon_activatable">False</property>
-                                            <property 
name="secondary_icon_activatable">False</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>
@@ -922,7 +808,6 @@
                                         <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>
@@ -936,11 +821,9 @@
                                     <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>
@@ -956,30 +839,22 @@
                                             <property 
name="visible">True</property>
                                             <property 
name="can_focus">True</property>
                                             <property 
name="max_length">15</property>
-                                            <property 
name="invisible_char">●</property>
+                                            <property 
name="invisible_char">&#x25CF;</property>
                                             <property 
name="width_chars">15</property>
-                                            <property 
name="primary_icon_activatable">False</property>
-                                            <property 
name="secondary_icon_activatable">False</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>
@@ -998,15 +873,12 @@
                     <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>
@@ -1019,7 +891,6 @@
             <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>
@@ -1031,27 +902,23 @@
             <child>
               <object class="GtkFrame" id="GNUNET_setup_transport_main_frame">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label_xalign">0</property>
                 <property name="shadow_type">none</property>
                 <child>
                   <object class="GtkAlignment" 
id="GNUNET_setup_transport_main_alignment">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <property name="left_padding">12</property>
                     <child>
                       <object class="GtkVBox" 
id="GNUNET_setup_transport_main_vbox">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
+                        <property name="orientation">vertical</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>
@@ -1067,12 +934,11 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property 
name="receives_default">False</property>
-                                <property 
name="use_action_appearance">False</property>
                                 <property name="use_underline">True</property>
                                 <property name="xalign">0</property>
                                 <property name="active">True</property>
                                 <property name="draw_indicator">True</property>
-                                <signal name="realize" 
handler="GNUNET_setup_transport_tcp_checkbutton_realize_cb" swapped="no"/>
+                                <signal name="realize" 
handler="GNUNET_setup_transport_tcp_checkbutton_realize_cb"/>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -1087,11 +953,10 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property 
name="receives_default">False</property>
-                                <property 
name="use_action_appearance">False</property>
                                 <property name="use_underline">True</property>
                                 <property name="xalign">0</property>
                                 <property name="draw_indicator">True</property>
-                                <signal name="realize" 
handler="GNUNET_setup_transport_udp_checkbutton_realize_cb" swapped="no"/>
+                                <signal name="realize" 
handler="GNUNET_setup_transport_udp_checkbutton_realize_cb"/>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -1106,12 +971,11 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property 
name="receives_default">False</property>
-                                <property 
name="use_action_appearance">False</property>
                                 <property name="use_underline">True</property>
                                 <property name="xalign">0</property>
                                 <property name="active">True</property>
                                 <property name="draw_indicator">True</property>
-                                <signal name="realize" 
handler="GNUNET_setup_transport_http_checkbutton_realize_cb" swapped="no"/>
+                                <signal name="realize" 
handler="GNUNET_setup_transport_http_checkbutton_realize_cb"/>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -1126,12 +990,11 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property 
name="receives_default">False</property>
-                                <property 
name="use_action_appearance">False</property>
                                 <property name="use_underline">True</property>
                                 <property name="xalign">0</property>
                                 <property name="active">True</property>
                                 <property name="draw_indicator">True</property>
-                                <signal name="realize" 
handler="GNUNET_setup_transport_https_checkbutton_realize_cb" swapped="no"/>
+                                <signal name="realize" 
handler="GNUNET_setup_transport_https_checkbutton_realize_cb"/>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -1146,11 +1009,10 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property 
name="receives_default">False</property>
-                                <property 
name="use_action_appearance">False</property>
                                 <property name="use_underline">True</property>
                                 <property name="xalign">0</property>
                                 <property name="draw_indicator">True</property>
-                                <signal name="realize" 
handler="GNUNET_setup_transport_dv_checkbutton_realize_cb" swapped="no"/>
+                                <signal name="realize" 
handler="GNUNET_setup_transport_dv_checkbutton_realize_cb"/>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -1165,11 +1027,10 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property 
name="receives_default">False</property>
-                                <property 
name="use_action_appearance">False</property>
                                 <property name="use_underline">True</property>
                                 <property name="xalign">0</property>
                                 <property name="draw_indicator">True</property>
-                                <signal name="realize" 
handler="GNUNET_setup_transport_wlan_checkbutton_realize_cb" swapped="no"/>
+                                <signal name="realize" 
handler="GNUNET_setup_transport_wlan_checkbutton_realize_cb"/>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -1192,16 +1053,14 @@
                             <child>
                               <object class="GtkVBox" 
id="GNUNET_setup_transport_tcp_vbox">
                                 <property name="visible">True</property>
-                                <property name="can_focus">False</property>
+                                <property 
name="orientation">vertical</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>
@@ -1216,10 +1075,8 @@
                                         <property 
name="visible">True</property>
                                         <property 
name="can_focus">True</property>
                                         <property 
name="max_length">5</property>
-                                        <property 
name="invisible_char">•</property>
+                                        <property 
name="invisible_char">&#x2022;</property>
                                         <property 
name="invisible_char_set">True</property>
-                                        <property 
name="primary_icon_activatable">False</property>
-                                        <property 
name="secondary_icon_activatable">False</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>
@@ -1235,7 +1092,6 @@
                                     <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>
@@ -1256,11 +1112,9 @@
                                 <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>
@@ -1275,10 +1129,8 @@
                                         <property 
name="visible">True</property>
                                         <property 
name="can_focus">True</property>
                                         <property 
name="max_length">5</property>
-                                        <property 
name="invisible_char">●</property>
+                                        <property 
name="invisible_char">&#x25CF;</property>
                                         <property 
name="invisible_char_set">True</property>
-                                        <property 
name="primary_icon_activatable">False</property>
-                                        <property 
name="secondary_icon_activatable">False</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>
@@ -1294,7 +1146,6 @@
                                     <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>
@@ -1314,15 +1165,11 @@
                                 <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>
@@ -1332,8 +1179,7 @@
                                         <property 
name="visible">True</property>
                                         <property 
name="can_focus">True</property>
                                         <property 
name="receives_default">True</property>
-                                        <property 
name="use_action_appearance">False</property>
-                                        <signal name="clicked" 
handler="GNUNET_setup_transport_tcp_test_button_clicked_cb" swapped="no"/>
+                                        <signal name="clicked" 
handler="GNUNET_setup_transport_tcp_test_button_clicked_cb"/>
                                       </object>
                                       <packing>
                                         <property 
name="expand">False</property>
@@ -1344,7 +1190,6 @@
                                     </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>
@@ -1357,7 +1202,6 @@
                                     </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>
@@ -1371,11 +1215,8 @@
                                     <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>
@@ -1392,7 +1233,6 @@
                             <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>
@@ -1402,16 +1242,14 @@
                             <child>
                               <object class="GtkVBox" 
id="GNUNET_setup_transport_udp_vbox">
                                 <property name="visible">True</property>
-                                <property name="can_focus">False</property>
+                                <property 
name="orientation">vertical</property>
                                 <child>
                                   <object class="GtkHBox" id="hbox5">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
                                     <property name="spacing">5</property>
                                     <child>
                                       <object class="GtkLabel" 
id="GNUNET_setup_transport_udp_port_label">
                                         <property 
name="visible">True</property>
-                                        <property 
name="can_focus">False</property>
                                         <property name="tooltip_text" 
translatable="yes">Port number that GNUnet's UDP transport should bind to on 
the local system</property>
                                         <property name="label" 
translatable="yes">Bind to port:</property>
                                       </object>
@@ -1427,10 +1265,8 @@
                                         <property 
name="visible">True</property>
                                         <property 
name="can_focus">True</property>
                                         <property 
name="max_length">5</property>
-                                        <property 
name="invisible_char">•</property>
+                                        <property 
name="invisible_char">&#x2022;</property>
                                         <property 
name="invisible_char_set">True</property>
-                                        <property 
name="primary_icon_activatable">False</property>
-                                        <property 
name="secondary_icon_activatable">False</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>
@@ -1457,17 +1293,14 @@
                                 <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>
@@ -1476,9 +1309,7 @@
                                       <object class="GtkSpinButton" 
id="GNUNET_setup_transport_udp_advertised_port_spinbutton">
                                         <property 
name="visible">True</property>
                                         <property 
name="can_focus">True</property>
-                                        <property 
name="invisible_char">●</property>
-                                        <property 
name="primary_icon_activatable">False</property>
-                                        <property 
name="secondary_icon_activatable">False</property>
+                                        <property 
name="invisible_char">&#x25CF;</property>
                                         <property 
name="primary_icon_sensitive">True</property>
                                         <property 
name="secondary_icon_sensitive">True</property>
                                         <property 
name="adjustment">GNUNET_setup_transport_udp_advertised_port_adjustment</property>
@@ -1486,7 +1317,6 @@
                                       </object>
                                       <packing>
                                         <property 
name="expand">False</property>
-                                        <property name="fill">True</property>
                                         <property name="padding">5</property>
                                         <property name="position">1</property>
                                       </packing>
@@ -1494,7 +1324,6 @@
                                     <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>
@@ -1515,15 +1344,11 @@
                                 <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>
@@ -1533,8 +1358,7 @@
                                         <property 
name="visible">True</property>
                                         <property 
name="can_focus">True</property>
                                         <property 
name="receives_default">True</property>
-                                        <property 
name="use_action_appearance">False</property>
-                                        <signal name="clicked" 
handler="GNUNET_setup_transport_udp_test_button_clicked_cb" swapped="no"/>
+                                        <signal name="clicked" 
handler="GNUNET_setup_transport_udp_test_button_clicked_cb"/>
                                       </object>
                                       <packing>
                                         <property 
name="expand">False</property>
@@ -1545,7 +1369,6 @@
                                     </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>
@@ -1558,7 +1381,6 @@
                                     </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>
@@ -1572,11 +1394,8 @@
                                     <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>
@@ -1599,7 +1418,6 @@
                             <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>
@@ -1610,16 +1428,14 @@
                             <child>
                               <object class="GtkVBox" 
id="GNUNET_setup_transport_http_vbox">
                                 <property name="visible">True</property>
-                                <property name="can_focus">False</property>
+                                <property 
name="orientation">vertical</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>
@@ -1637,10 +1453,8 @@
                                         <property 
name="visible">True</property>
                                         <property 
name="can_focus">True</property>
                                         <property 
name="max_length">5</property>
-                                        <property 
name="invisible_char">•</property>
+                                        <property 
name="invisible_char">&#x2022;</property>
                                         <property 
name="invisible_char_set">True</property>
-                                        <property 
name="primary_icon_activatable">False</property>
-                                        <property 
name="secondary_icon_activatable">False</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>
@@ -1667,17 +1481,14 @@
                                 <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>
@@ -1687,10 +1498,8 @@
                                         <property 
name="visible">True</property>
                                         <property 
name="can_focus">True</property>
                                         <property 
name="max_length">5</property>
-                                        <property 
name="invisible_char">●</property>
+                                        <property 
name="invisible_char">&#x25CF;</property>
                                         <property 
name="invisible_char_set">True</property>
-                                        <property 
name="primary_icon_activatable">False</property>
-                                        <property 
name="secondary_icon_activatable">False</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>
@@ -1698,7 +1507,6 @@
                                       </object>
                                       <packing>
                                         <property 
name="expand">False</property>
-                                        <property name="fill">True</property>
                                         <property name="padding">5</property>
                                         <property name="position">1</property>
                                       </packing>
@@ -1706,7 +1514,6 @@
                                     <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>
@@ -1727,15 +1534,11 @@
                                 <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>
@@ -1745,8 +1548,7 @@
                                         <property 
name="visible">True</property>
                                         <property 
name="can_focus">True</property>
                                         <property 
name="receives_default">True</property>
-                                        <property 
name="use_action_appearance">False</property>
-                                        <signal name="clicked" 
handler="GNUNET_setup_transport_http_test_button_clicked_cb" swapped="no"/>
+                                        <signal name="clicked" 
handler="GNUNET_setup_transport_http_test_button_clicked_cb"/>
                                       </object>
                                       <packing>
                                         <property 
name="expand">False</property>
@@ -1757,7 +1559,6 @@
                                     </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>
@@ -1770,7 +1571,6 @@
                                     </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>
@@ -1784,11 +1584,8 @@
                                     <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>
@@ -1811,7 +1608,6 @@
                             <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>
@@ -1822,16 +1618,14 @@
                             <child>
                               <object class="GtkVBox" 
id="GNUNET_setup_transport_https_vbox">
                                 <property name="visible">True</property>
-                                <property name="can_focus">False</property>
+                                <property 
name="orientation">vertical</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>
@@ -1849,10 +1643,8 @@
                                         <property 
name="visible">True</property>
                                         <property 
name="can_focus">True</property>
                                         <property 
name="max_length">5</property>
-                                        <property 
name="invisible_char">•</property>
+                                        <property 
name="invisible_char">&#x2022;</property>
                                         <property 
name="invisible_char_set">True</property>
-                                        <property 
name="primary_icon_activatable">False</property>
-                                        <property 
name="secondary_icon_activatable">False</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>
@@ -1879,17 +1671,14 @@
                                 <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>
@@ -1899,10 +1688,8 @@
                                         <property 
name="visible">True</property>
                                         <property 
name="can_focus">True</property>
                                         <property 
name="max_length">5</property>
-                                        <property 
name="invisible_char">●</property>
+                                        <property 
name="invisible_char">&#x25CF;</property>
                                         <property 
name="invisible_char_set">True</property>
-                                        <property 
name="primary_icon_activatable">False</property>
-                                        <property 
name="secondary_icon_activatable">False</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>
@@ -1910,7 +1697,6 @@
                                       </object>
                                       <packing>
                                         <property 
name="expand">False</property>
-                                        <property name="fill">True</property>
                                         <property name="padding">5</property>
                                         <property name="position">1</property>
                                       </packing>
@@ -1918,7 +1704,6 @@
                                     <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>
@@ -1939,15 +1724,11 @@
                                 <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>
@@ -1957,8 +1738,7 @@
                                         <property 
name="visible">True</property>
                                         <property 
name="can_focus">True</property>
                                         <property 
name="receives_default">True</property>
-                                        <property 
name="use_action_appearance">False</property>
-                                        <signal name="clicked" 
handler="GNUNET_setup_transport_https_test_button_clicked_cb" swapped="no"/>
+                                        <signal name="clicked" 
handler="GNUNET_setup_transport_https_test_button_clicked_cb"/>
                                       </object>
                                       <packing>
                                         <property 
name="expand">False</property>
@@ -1969,7 +1749,6 @@
                                     </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>
@@ -1982,7 +1761,6 @@
                                     </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>
@@ -1996,11 +1774,8 @@
                                     <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>
@@ -2023,7 +1798,6 @@
                             <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>
@@ -2034,7 +1808,7 @@
                             <child>
                               <object class="GtkVBox" 
id="GNUNET_setup_transport_dv_vbox">
                                 <property name="visible">True</property>
-                                <property name="can_focus">False</property>
+                                <property 
name="orientation">vertical</property>
                                 <child>
                                   <placeholder/>
                                 </child>
@@ -2046,7 +1820,6 @@
                             <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>
@@ -2057,15 +1830,12 @@
                             <child>
                               <object class="GtkVBox" 
id="GNUNET_setup_transport_wlan_vbox">
                                 <property name="visible">True</property>
-                                <property name="can_focus">False</property>
                                 <child>
                                   <object class="GtkHBox" 
id="GNUNET_setup_transport_wlan_hbox">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
                                     <child>
                                       <object class="GtkLabel" 
id="GNUNET_setup_transport_wlan_interface_label">
                                         <property 
name="visible">True</property>
-                                        <property 
name="can_focus">False</property>
                                         <property name="label" 
translatable="yes">Name of _Monitor Interface</property>
                                         <property 
name="use_underline">True</property>
                                       </object>
@@ -2081,16 +1851,12 @@
                                         <property 
name="visible">True</property>
                                         <property 
name="can_focus">True</property>
                                         <property 
name="max_length">255</property>
-                                        <property 
name="invisible_char">●</property>
+                                        <property 
name="invisible_char">&#x25CF;</property>
                                         <property 
name="invisible_char_set">True</property>
-                                        <property 
name="primary_icon_activatable">False</property>
-                                        <property 
name="secondary_icon_activatable">False</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>
@@ -2098,7 +1864,6 @@
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
-                                    <property name="fill">True</property>
                                     <property name="padding">5</property>
                                     <property name="position">0</property>
                                   </packing>
@@ -2114,7 +1879,6 @@
                             <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>
@@ -2124,8 +1888,6 @@
                             </child>
                           </object>
                           <packing>
-                            <property name="expand">True</property>
-                            <property name="fill">True</property>
                             <property name="position">1</property>
                           </packing>
                         </child>
@@ -2136,7 +1898,6 @@
                 <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>
@@ -2149,7 +1910,6 @@
             <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>
@@ -2161,29 +1921,25 @@
             <child>
               <object class="GtkVBox" id="GNUNET_setup_fs_main_vbox">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="orientation">vertical</property>
                 <child>
                   <object class="GtkFrame" id="GNUNET_setup_fs_frame">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <property name="label_xalign">0</property>
                     <property name="shadow_type">none</property>
                     <child>
                       <object class="GtkAlignment" 
id="GNUNET_setup_fs_alignment">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
                         <property name="left_padding">12</property>
                         <child>
                           <object class="GtkHBox" 
id="GNUNET_setup_fs_migration_hbox">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
                             <child>
                               <object class="GtkCheckButton" 
id="GNUNET_setup_fs_migration_from_checkbutton">
                                 <property name="label" 
translatable="yes">Enable unsolicited content transmission from this 
peer</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property 
name="receives_default">False</property>
-                                <property 
name="use_action_appearance">False</property>
                                 <property name="xalign">0</property>
                                 <property name="active">True</property>
                                 <property name="draw_indicator">True</property>
@@ -2201,14 +1957,11 @@
                                 <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>
@@ -2219,7 +1972,6 @@
                     <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>
@@ -2234,26 +1986,22 @@
                 <child>
                   <object class="GtkFrame" id="GNUNET_setup_datastore_frame">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <property name="label_xalign">0</property>
                     <property name="shadow_type">none</property>
                     <child>
                       <object class="GtkAlignment" 
id="GNUNET_setup_datastore_alignment">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
                         <property name="left_padding">12</property>
                         <child>
                           <object class="GtkVBox" 
id="GNUNET_setup_datastore_vbox">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
+                            <property name="orientation">vertical</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>
@@ -2266,7 +2014,6 @@
                                 <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">
@@ -2274,11 +2021,10 @@
                                         <property 
name="visible">True</property>
                                         <property 
name="can_focus">True</property>
                                         <property 
name="receives_default">False</property>
-                                        <property 
name="use_action_appearance">False</property>
                                         <property name="xalign">0</property>
                                         <property name="active">True</property>
                                         <property 
name="draw_indicator">True</property>
-                                        <signal name="realize" 
handler="GNUNET_setup_fs_datastore_sqlite_radiobutton_realize_cb" swapped="no"/>
+                                        <signal name="realize" 
handler="GNUNET_setup_fs_datastore_sqlite_radiobutton_realize_cb"/>
                                       </object>
                                       <packing>
                                         <property 
name="expand">False</property>
@@ -2292,12 +2038,11 @@
                                         <property 
name="visible">True</property>
                                         <property 
name="can_focus">True</property>
                                         <property 
name="receives_default">False</property>
-                                        <property 
name="use_action_appearance">False</property>
                                         <property name="xalign">0</property>
                                         <property 
name="yalign">0.50999999046325684</property>
                                         <property 
name="draw_indicator">True</property>
                                         <property 
name="group">GNUNET_setup_fs_datastore_sqlite_radiobutton</property>
-                                        <signal name="realize" 
handler="GNUNET_setup_fs_datastore_mysql_radiobutton_realize_cb" swapped="no"/>
+                                        <signal name="realize" 
handler="GNUNET_setup_fs_datastore_mysql_radiobutton_realize_cb"/>
                                       </object>
                                       <packing>
                                         <property 
name="expand">False</property>
@@ -2311,11 +2056,10 @@
                                         <property 
name="visible">True</property>
                                         <property 
name="can_focus">True</property>
                                         <property 
name="receives_default">False</property>
-                                        <property 
name="use_action_appearance">False</property>
                                         <property name="xalign">0</property>
                                         <property 
name="draw_indicator">True</property>
                                         <property 
name="group">GNUNET_setup_fs_datastore_sqlite_radiobutton</property>
-                                        <signal name="realize" 
handler="GNUNET_setup_fs_datastore_postgres_radiobutton_realize_cb" 
swapped="no"/>
+                                        <signal name="realize" 
handler="GNUNET_setup_fs_datastore_postgres_radiobutton_realize_cb"/>
                                       </object>
                                       <packing>
                                         <property 
name="expand">False</property>
@@ -2333,11 +2077,9 @@
                                 <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>
@@ -2345,7 +2087,6 @@
                                 <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>
@@ -2359,10 +2100,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">•</property>
+                                    <property 
name="invisible_char">&#x2022;</property>
                                     <property 
name="invisible_char_set">True</property>
-                                    <property 
name="primary_icon_activatable">False</property>
-                                    <property 
name="secondary_icon_activatable">False</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>
@@ -2388,14 +2127,12 @@
                                 <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>
@@ -2405,15 +2142,13 @@
                                 <child>
                                   <object class="GtkVBox" 
id="GNUNET_setup_datastore_mysql_vbox">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
+                                    <property 
name="orientation">vertical</property>
                                     <child>
                                       <object class="GtkHBox" id="hbox13">
                                         <property 
name="visible">True</property>
-                                        <property 
name="can_focus">False</property>
                                         <child>
                                           <object class="GtkLabel" 
id="GNUNET_setup_datastore_mysql_database_name_label">
                                             <property 
name="visible">True</property>
-                                            <property 
name="can_focus">False</property>
                                             <property name="label" 
translatable="yes">MySQL database name:</property>
                                           </object>
                                           <packing>
@@ -2427,37 +2162,29 @@
                                           <object class="GtkEntry" 
id="GNUNET_setup_datastore_mysql_database_name_entry">
                                             <property 
name="visible">True</property>
                                             <property 
name="can_focus">True</property>
-                                            <property 
name="invisible_char">•</property>
+                                            <property 
name="invisible_char">&#x2022;</property>
                                             <property name="text" 
translatable="yes">gnunet</property>
                                             <property 
name="invisible_char_set">True</property>
-                                            <property 
name="primary_icon_activatable">False</property>
-                                            <property 
name="secondary_icon_activatable">False</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" swapped="no"/>
+                                            <signal name="changed" 
handler="GNUNET_setup_datastore_mysql_invalidate_cb"/>
                                           </object>
                                           <packing>
-                                            <property 
name="expand">True</property>
-                                            <property 
name="fill">True</property>
                                             <property 
name="padding">5</property>
                                             <property 
name="position">1</property>
                                           </packing>
                                         </child>
                                       </object>
                                       <packing>
-                                        <property name="expand">True</property>
-                                        <property name="fill">True</property>
                                         <property name="position">0</property>
                                       </packing>
                                     </child>
                                     <child>
                                       <object class="GtkHBox" id="hbox14">
                                         <property 
name="visible">True</property>
-                                        <property 
name="can_focus">False</property>
                                         <child>
                                           <object class="GtkLabel" 
id="GNUNET_setup_datastore_mysql_config_file_label">
                                             <property 
name="visible">True</property>
-                                            <property 
name="can_focus">False</property>
                                             <property name="label" 
translatable="yes">Configuration file:</property>
                                           </object>
                                           <packing>
@@ -2469,30 +2196,23 @@
                                         <child>
                                           <object class="GtkFileChooserButton" 
id="GNUNET_setup_datastore_mysql_config_file_filechooserbutton">
                                             <property 
name="visible">True</property>
-                                            <property 
name="can_focus">False</property>
                                           </object>
                                           <packing>
-                                            <property 
name="expand">True</property>
-                                            <property 
name="fill">True</property>
                                             <property 
name="padding">5</property>
                                             <property 
name="position">1</property>
                                           </packing>
                                         </child>
                                       </object>
                                       <packing>
-                                        <property name="expand">True</property>
-                                        <property name="fill">True</property>
                                         <property name="position">1</property>
                                       </packing>
                                     </child>
                                     <child>
                                       <object class="GtkHBox" id="hbox15">
                                         <property 
name="visible">True</property>
-                                        <property 
name="can_focus">False</property>
                                         <child>
                                           <object class="GtkLabel" 
id="GNUNET_setup_datastore_mysql_username_label">
                                             <property 
name="visible">True</property>
-                                            <property 
name="can_focus">False</property>
                                             <property name="label" 
translatable="yes">Username:</property>
                                           </object>
                                           <packing>
@@ -2506,16 +2226,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">•</property>
+                                            <property 
name="invisible_char">&#x2022;</property>
                                             <property 
name="invisible_char_set">True</property>
-                                            <property 
name="primary_icon_activatable">False</property>
-                                            <property 
name="secondary_icon_activatable">False</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>
@@ -2523,7 +2239,6 @@
                                         <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>
@@ -2536,35 +2251,27 @@
                                           <object class="GtkEntry" 
id="GNUNET_setup_datastore_mysql_password_entry">
                                             <property 
name="visible">True</property>
                                             <property 
name="can_focus">True</property>
-                                            <property 
name="invisible_char">•</property>
+                                            <property 
name="invisible_char">&#x2022;</property>
                                             <property 
name="invisible_char_set">True</property>
-                                            <property 
name="primary_icon_activatable">False</property>
-                                            <property 
name="secondary_icon_activatable">False</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="hbox16">
                                         <property 
name="visible">True</property>
-                                        <property 
name="can_focus">False</property>
                                         <child>
                                           <object class="GtkLabel" 
id="GNUNET_setup-datastore_mysql_hostname_label">
                                             <property 
name="visible">True</property>
-                                            <property 
name="can_focus">False</property>
                                             <property name="label" 
translatable="yes">MySQL Server Hostname:</property>
                                           </object>
                                           <packing>
@@ -2578,17 +2285,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">•</property>
+                                            <property 
name="invisible_char">&#x2022;</property>
                                             <property name="text" 
translatable="yes">localhost</property>
                                             <property 
name="invisible_char_set">True</property>
-                                            <property 
name="primary_icon_activatable">False</property>
-                                            <property 
name="secondary_icon_activatable">False</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>
@@ -2596,7 +2299,6 @@
                                         <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>
@@ -2610,15 +2312,13 @@
                                           <object class="GtkSpinButton" 
id="GNUNET_setup_datastore_mysql_port_spinbutton">
                                             <property 
name="visible">True</property>
                                             <property 
name="can_focus">True</property>
-                                            <property 
name="invisible_char">•</property>
+                                            <property 
name="invisible_char">&#x2022;</property>
                                             <property 
name="invisible_char_set">True</property>
-                                            <property 
name="primary_icon_activatable">False</property>
-                                            <property 
name="secondary_icon_activatable">False</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" swapped="no"/>
+                                            <signal name="value_changed" 
handler="GNUNET_setup_datastore_mysql_invalidate_cb"/>
                                           </object>
                                           <packing>
                                             <property 
name="expand">False</property>
@@ -2629,8 +2329,6 @@
                                         </child>
                                       </object>
                                       <packing>
-                                        <property name="expand">True</property>
-                                        <property name="fill">True</property>
                                         <property name="position">3</property>
                                       </packing>
                                     </child>
@@ -2642,55 +2340,43 @@
                                 <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="visible">True</property>
                                         <property 
name="can_focus">True</property>
                                         <property 
name="receives_default">True</property>
-                                        <property name="label" 
translatable="yes">Test configuration</property>
-                                        <signal name="clicked" 
handler="GNUNET_setup_datastore_mysql_tab_test_button_clicked_cb" swapped="no"/>
+                                        <signal name="clicked" 
handler="GNUNET_setup_datastore_mysql_tab_test_button_clicked_cb"/>
                                       </object>
                                       <packing>
-                                        <property name="expand">True</property>
-                                        <property name="fill">True</property>
-                                        <property name="position">1</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>
@@ -2703,16 +2389,13 @@
                                 <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>
@@ -2721,17 +2404,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">•</property>
+                                        <property 
name="invisible_char">&#x2022;</property>
                                         <property 
name="invisible_char_set">True</property>
-                                        <property 
name="primary_icon_activatable">False</property>
-                                        <property 
name="secondary_icon_activatable">False</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" swapped="no"/>
+                                        <signal name="changed" 
handler="GNUNET_setup_datastore_postgres_invalidate_cb"/>
                                       </object>
                                       <packing>
-                                        <property name="expand">True</property>
-                                        <property name="fill">True</property>
                                         <property name="padding">5</property>
                                         <property name="position">1</property>
                                       </packing>
@@ -2744,55 +2423,43 @@
                                 <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="visible">True</property>
                                         <property 
name="can_focus">True</property>
                                         <property 
name="receives_default">True</property>
-                                        <property name="label" 
translatable="yes">Test configuration</property>
-                                        <signal name="clicked" 
handler="GNUNET_setup_datastore_postgres_tab_test_button_clicked_cb" 
swapped="no"/>
+                                        <signal name="clicked" 
handler="GNUNET_setup_datastore_postgres_tab_test_button_clicked_cb"/>
                                       </object>
                                       <packing>
-                                        <property name="expand">True</property>
-                                        <property name="fill">True</property>
-                                        <property name="position">1</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>
@@ -2804,8 +2471,6 @@
                                 </child>
                               </object>
                               <packing>
-                                <property name="expand">True</property>
-                                <property name="fill">True</property>
                                 <property name="position">1</property>
                               </packing>
                             </child>
@@ -2816,41 +2481,34 @@
                     <child type="label">
                       <object class="GtkLabel" 
id="GNUNET_setup_datastore_frame_label">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
                         <property name="label" 
translatable="yes">&lt;b&gt;Configure Datastore (persistent 
storage)&lt;/b&gt;</property>
                         <property name="use_markup">True</property>
                       </object>
                     </child>
                   </object>
                   <packing>
-                    <property name="expand">True</property>
-                    <property name="fill">True</property>
                     <property name="position">1</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkFrame" id="GNUNET_setup_datacache_frame">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <property name="label_xalign">0</property>
                     <property name="shadow_type">none</property>
                     <child>
                       <object class="GtkAlignment" 
id="GNUNET_setup_datacache_alignment">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
                         <property name="left_padding">12</property>
                         <child>
                           <object class="GtkVBox" 
id="GNUNET_setup_datacache_vbox">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
+                            <property name="orientation">vertical</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>
@@ -2863,7 +2521,6 @@
                                 <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">
@@ -2875,7 +2532,7 @@
                                         <property name="xalign">0</property>
                                         <property name="active">True</property>
                                         <property 
name="draw_indicator">True</property>
-                                        <signal name="realize" 
handler="GNUNET_setup_fs_datacache_sqlite_radiobutton_realize_cb" swapped="no"/>
+                                        <signal name="realize" 
handler="GNUNET_setup_fs_datacache_sqlite_radiobutton_realize_cb"/>
                                       </object>
                                       <packing>
                                         <property 
name="expand">False</property>
@@ -2889,12 +2546,11 @@
                                         <property 
name="visible">True</property>
                                         <property 
name="can_focus">True</property>
                                         <property 
name="receives_default">False</property>
-                                        <property 
name="use_action_appearance">False</property>
                                         <property name="xalign">0</property>
                                         <property 
name="yalign">0.50999999046325684</property>
                                         <property 
name="draw_indicator">True</property>
                                         <property 
name="group">GNUNET_setup_fs_datacache_sqlite_radiobutton</property>
-                                        <signal name="realize" 
handler="GNUNET_setup_fs_datacache_mysql_radiobutton_realize_cb" swapped="no"/>
+                                        <signal name="realize" 
handler="GNUNET_setup_fs_datacache_mysql_radiobutton_realize_cb"/>
                                       </object>
                                       <packing>
                                         <property 
name="expand">False</property>
@@ -2908,11 +2564,10 @@
                                         <property 
name="visible">True</property>
                                         <property 
name="can_focus">True</property>
                                         <property 
name="receives_default">False</property>
-                                        <property 
name="use_action_appearance">False</property>
                                         <property name="xalign">0</property>
                                         <property 
name="draw_indicator">True</property>
                                         <property 
name="group">GNUNET_setup_fs_datacache_sqlite_radiobutton</property>
-                                        <signal name="realize" 
handler="GNUNET_setup_fs_datacache_postgres_radiobutton_realize_cb" 
swapped="no"/>
+                                        <signal name="realize" 
handler="GNUNET_setup_fs_datacache_postgres_radiobutton_realize_cb"/>
                                       </object>
                                       <packing>
                                         <property 
name="expand">False</property>
@@ -2930,11 +2585,9 @@
                                 <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>
@@ -2942,7 +2595,6 @@
                                 <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>
@@ -2956,10 +2608,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">•</property>
+                                    <property 
name="invisible_char">&#x2022;</property>
                                     <property 
name="invisible_char_set">True</property>
-                                    <property 
name="primary_icon_activatable">False</property>
-                                    <property 
name="secondary_icon_activatable">False</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>
@@ -2985,14 +2635,12 @@
                                 <child>
                                   <object class="GtkLabel" 
id="GNUNET_setup_fs_datacache_sqlite_label">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
                                     <property name="label" 
translatable="yes">No setup required.</property>
                                   </object>
                                 </child>
                                 <child type="tab">
                                   <object class="GtkLabel" id="label4c">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
                                     <property name="label" 
translatable="yes">sqLite</property>
                                   </object>
                                   <packing>
@@ -3002,15 +2650,13 @@
                                 <child>
                                   <object class="GtkVBox" 
id="GNUNET_setup_datacache_mysql_vbox">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
+                                    <property 
name="orientation">vertical</property>
                                     <child>
                                       <object class="GtkHBox" id="hbox13c">
                                         <property 
name="visible">True</property>
-                                        <property 
name="can_focus">False</property>
                                         <child>
                                           <object class="GtkLabel" 
id="GNUNET_setup_datacache_mysql_database_name_label">
                                             <property 
name="visible">True</property>
-                                            <property 
name="can_focus">False</property>
                                             <property name="label" 
translatable="yes">MySQL database name:</property>
                                           </object>
                                           <packing>
@@ -3024,37 +2670,29 @@
                                           <object class="GtkEntry" 
id="GNUNET_setup_datacache_mysql_database_name_entry">
                                             <property 
name="visible">True</property>
                                             <property 
name="can_focus">True</property>
-                                            <property 
name="invisible_char">•</property>
+                                            <property 
name="invisible_char">&#x2022;</property>
                                             <property name="text" 
translatable="yes">gnunet</property>
                                             <property 
name="invisible_char_set">True</property>
-                                            <property 
name="primary_icon_activatable">False</property>
-                                            <property 
name="secondary_icon_activatable">False</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" swapped="no"/>
+                                            <signal name="changed" 
handler="GNUNET_setup_datacache_mysql_invalidate_cb"/>
                                           </object>
                                           <packing>
-                                            <property 
name="expand">True</property>
-                                            <property 
name="fill">True</property>
                                             <property 
name="padding">5</property>
                                             <property 
name="position">1</property>
                                           </packing>
                                         </child>
                                       </object>
                                       <packing>
-                                        <property name="expand">True</property>
-                                        <property name="fill">True</property>
                                         <property name="position">0</property>
                                       </packing>
                                     </child>
                                     <child>
                                       <object class="GtkHBox" id="hbox14c">
                                         <property 
name="visible">True</property>
-                                        <property 
name="can_focus">False</property>
                                         <child>
                                           <object class="GtkLabel" 
id="GNUNET_setup_datacache_mysql_config_file_label">
                                             <property 
name="visible">True</property>
-                                            <property 
name="can_focus">False</property>
                                             <property name="label" 
translatable="yes">Configuration file:</property>
                                           </object>
                                           <packing>
@@ -3066,31 +2704,24 @@
                                         <child>
                                           <object class="GtkFileChooserButton" 
id="GNUNET_setup_datacache_mysql_config_file_filechooserbutton">
                                             <property 
name="visible">True</property>
-                                            <property 
name="can_focus">False</property>
-                                            <signal name="file-set" 
handler="GNUNET_setup_datacache_mysql_invalidate_cb" swapped="no"/>
+                                            <signal name="file_set" 
handler="GNUNET_setup_datacache_mysql_invalidate_cb"/>
                                           </object>
                                           <packing>
-                                            <property 
name="expand">True</property>
-                                            <property 
name="fill">True</property>
                                             <property 
name="padding">5</property>
                                             <property 
name="position">1</property>
                                           </packing>
                                         </child>
                                       </object>
                                       <packing>
-                                        <property name="expand">True</property>
-                                        <property name="fill">True</property>
                                         <property name="position">1</property>
                                       </packing>
                                     </child>
                                     <child>
                                       <object class="GtkHBox" id="hbox15c">
                                         <property 
name="visible">True</property>
-                                        <property 
name="can_focus">False</property>
                                         <child>
                                           <object class="GtkLabel" 
id="GNUNET_setup_datacache_mysql_username_label">
                                             <property 
name="visible">True</property>
-                                            <property 
name="can_focus">False</property>
                                             <property name="label" 
translatable="yes">Username:</property>
                                           </object>
                                           <packing>
@@ -3104,17 +2735,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">•</property>
+                                            <property 
name="invisible_char">&#x2022;</property>
                                             <property 
name="invisible_char_set">True</property>
-                                            <property 
name="primary_icon_activatable">False</property>
-                                            <property 
name="secondary_icon_activatable">False</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" swapped="no"/>
+                                            <signal name="changed" 
handler="GNUNET_setup_datacache_mysql_invalidate_cb"/>
                                           </object>
                                           <packing>
-                                            <property 
name="expand">True</property>
-                                            <property 
name="fill">True</property>
                                             <property 
name="padding">5</property>
                                             <property 
name="position">1</property>
                                           </packing>
@@ -3122,7 +2749,6 @@
                                         <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>
@@ -3135,36 +2761,28 @@
                                           <object class="GtkEntry" 
id="GNUNET_setup_datacache_mysql_password_entry">
                                             <property 
name="visible">True</property>
                                             <property 
name="can_focus">True</property>
-                                            <property 
name="invisible_char">•</property>
+                                            <property 
name="invisible_char">&#x2022;</property>
                                             <property 
name="invisible_char_set">True</property>
-                                            <property 
name="primary_icon_activatable">False</property>
-                                            <property 
name="secondary_icon_activatable">False</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" swapped="no"/>
+                                            <signal name="changed" 
handler="GNUNET_setup_datacache_mysql_invalidate_cb"/>
                                           </object>
                                           <packing>
-                                            <property 
name="expand">True</property>
-                                            <property 
name="fill">True</property>
                                             <property 
name="padding">5</property>
                                             <property 
name="position">3</property>
                                           </packing>
                                         </child>
                                       </object>
                                       <packing>
-                                        <property name="expand">True</property>
-                                        <property name="fill">True</property>
                                         <property name="position">2</property>
                                       </packing>
                                     </child>
                                     <child>
                                       <object class="GtkHBox" id="hbox16c">
                                         <property 
name="visible">True</property>
-                                        <property 
name="can_focus">False</property>
                                         <child>
                                           <object class="GtkLabel" 
id="GNUNET_setup-datacache_mysql_hostname_label">
                                             <property 
name="visible">True</property>
-                                            <property 
name="can_focus">False</property>
                                             <property name="label" 
translatable="yes">MySQL Server Hostname:</property>
                                           </object>
                                           <packing>
@@ -3178,18 +2796,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">•</property>
+                                            <property 
name="invisible_char">&#x2022;</property>
                                             <property name="text" 
translatable="yes">localhost</property>
                                             <property 
name="invisible_char_set">True</property>
-                                            <property 
name="primary_icon_activatable">False</property>
-                                            <property 
name="secondary_icon_activatable">False</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" swapped="no"/>
+                                            <signal name="changed" 
handler="GNUNET_setup_datacache_mysql_invalidate_cb"/>
                                           </object>
                                           <packing>
-                                            <property 
name="expand">True</property>
-                                            <property 
name="fill">True</property>
                                             <property 
name="padding">5</property>
                                             <property 
name="position">1</property>
                                           </packing>
@@ -3197,7 +2811,6 @@
                                         <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>
@@ -3211,15 +2824,13 @@
                                           <object class="GtkSpinButton" 
id="GNUNET_setup_datacache_mysql_port_spinbutton">
                                             <property 
name="visible">True</property>
                                             <property 
name="can_focus">True</property>
-                                            <property 
name="invisible_char">•</property>
+                                            <property 
name="invisible_char">&#x2022;</property>
                                             <property 
name="invisible_char_set">True</property>
-                                            <property 
name="primary_icon_activatable">False</property>
-                                            <property 
name="secondary_icon_activatable">False</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" swapped="no"/>
+                                            <signal name="value_changed" 
handler="GNUNET_setup_datacache_mysql_invalidate_cb"/>
                                           </object>
                                           <packing>
                                             <property 
name="expand">False</property>
@@ -3230,8 +2841,6 @@
                                         </child>
                                       </object>
                                       <packing>
-                                        <property name="expand">True</property>
-                                        <property name="fill">True</property>
                                         <property name="position">3</property>
                                       </packing>
                                     </child>
@@ -3243,55 +2852,44 @@
                                 <child type="tab">
                                   <object class="GtkHBox" id="hbox3a">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
                                     <child>
                                       <object class="GtkLabel" 
id="GNUNET_setup_datacache_mysql_tab_label">
                                         <property 
name="visible">True</property>
-                                        <property 
name="can_focus">False</property>
                                         <property name="label" 
translatable="yes">MySQL</property>
                                       </object>
                                       <packing>
-                                        <property name="expand">True</property>
-                                        <property name="fill">True</property>
                                         <property name="position">0</property>
                                       </packing>
                                     </child>
                                     <child>
                                       <object class="GtkButton" 
id="GNUNET_setup_datacache_mysql_tab_test_button">
+                                        <property name="label" 
translatable="yes">Test configuration</property>
                                         <property 
name="visible">True</property>
                                         <property 
name="can_focus">True</property>
                                         <property 
name="receives_default">True</property>
-                                        <property name="label" 
translatable="yes">Test configuration</property>
-                                        <signal name="clicked" 
handler="GNUNET_setup_datacache_mysql_tab_test_button_clicked_cb" swapped="no"/>
+                                        <signal name="clicked" 
handler="GNUNET_setup_datacache_mysql_tab_test_button_clicked_cb"/>
                                       </object>
                                       <packing>
-                                        <property name="expand">True</property>
-                                        <property name="fill">True</property>
-                                        <property name="position">1</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>
@@ -3304,16 +2902,13 @@
                                 <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>
@@ -3322,17 +2917,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">•</property>
+                                        <property 
name="invisible_char">&#x2022;</property>
                                         <property 
name="invisible_char_set">True</property>
-                                        <property 
name="primary_icon_activatable">False</property>
-                                        <property 
name="secondary_icon_activatable">False</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" swapped="no"/>
+                                        <signal name="changed" 
handler="GNUNET_setup_datacache_postgres_invalidate_cb"/>
                                       </object>
                                       <packing>
-                                        <property name="expand">True</property>
-                                        <property name="fill">True</property>
                                         <property name="padding">5</property>
                                         <property name="position">1</property>
                                       </packing>
@@ -3346,55 +2937,43 @@
                                 <child type="tab">
                                   <object class="GtkHBox" id="hbox8a">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
                                     <child>
                                       <object class="GtkLabel" 
id="GNUNET_setup_datacache_postgres_tab_label">
                                         <property 
name="visible">True</property>
-                                        <property 
name="can_focus">False</property>
                                         <property name="label" 
translatable="yes">Postgres</property>
                                       </object>
                                       <packing>
-                                        <property name="expand">True</property>
-                                        <property name="fill">True</property>
                                         <property name="position">0</property>
                                       </packing>
                                     </child>
                                     <child>
                                       <object class="GtkButton" 
id="GNUNET_setup_datacache_postgres_tab_test_button">
+                                        <property name="label" 
translatable="yes">Test configuration</property>
                                         <property 
name="visible">True</property>
                                         <property 
name="can_focus">True</property>
                                         <property 
name="receives_default">True</property>
-                                        <property name="label" 
translatable="yes">Test configuration</property>
-                                        <signal name="clicked" 
handler="GNUNET_setup_datacache_postgres_tab_test_button_clicked_cb" 
swapped="no"/>
+                                        <signal name="clicked" 
handler="GNUNET_setup_datacache_postgres_tab_test_button_clicked_cb"/>
                                       </object>
                                       <packing>
-                                        <property name="expand">True</property>
-                                        <property name="fill">True</property>
-                                        <property name="position">1</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>
@@ -3407,7 +2986,6 @@
                               </object>
                               <packing>
                                 <property name="expand">False</property>
-                                <property name="fill">True</property>
                                 <property name="position">1</property>
                               </packing>
                             </child>
@@ -3418,15 +2996,12 @@
                     <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>
@@ -3438,7 +3013,6 @@
             <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>
@@ -3450,36 +3024,31 @@
             <child>
               <object class="GtkVBox" id="GNUNET_setup_vpn_vbox">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="orientation">vertical</property>
                 <child>
                   <object class="GtkFrame" 
id="GNUNET_setup_vpn_master_interface_configuration_frame">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <property name="label_xalign">0</property>
                     <property name="shadow_type">none</property>
                     <child>
                       <object class="GtkAlignment" 
id="GNUNET_setup_vpn_master_interface_configuration_frame_alignment">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
                         <property name="left_padding">12</property>
                         <child>
                           <object class="GtkVBox" 
id="GNUNET_setup_vpn_master_vbox">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
+                            <property name="orientation">vertical</property>
                             <child>
                               <object class="GtkHBox" 
id="GNUNET_setup_vpn_master_interface_hbox">
                                 <property name="visible">True</property>
-                                <property name="can_focus">False</property>
                                 <child>
                                   <object class="GtkLabel" id="label18">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
                                     <property name="label" 
translatable="yes">Master _interface name:</property>
                                     <property 
name="use_underline">True</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
-                                    <property name="fill">True</property>
                                     <property name="padding">5</property>
                                     <property name="position">0</property>
                                   </packing>
@@ -3488,38 +3057,31 @@
                                   <object class="GtkEntry" 
id="GNUNET_setup_vpn_master_interface_entry">
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
-                                    <property 
name="invisible_char">●</property>
-                                    <property 
name="primary_icon_activatable">False</property>
-                                    <property 
name="secondary_icon_activatable">False</property>
+                                    <property 
name="invisible_char">&#x25CF;</property>
                                     <property 
name="primary_icon_sensitive">True</property>
                                     <property 
name="secondary_icon_sensitive">True</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
-                                    <property name="fill">True</property>
                                     <property name="position">1</property>
                                   </packing>
                                 </child>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
-                                <property name="fill">True</property>
                                 <property name="position">0</property>
                               </packing>
                             </child>
                             <child>
                               <object class="GtkHBox" 
id="GNUNET_setup_vpn_master_interface_v4_hbox">
                                 <property name="visible">True</property>
-                                <property name="can_focus">False</property>
                                 <child>
                                   <object class="GtkLabel" 
id="GNUNET_setup_vpn_master_interface_v4_label">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
                                     <property name="label" 
translatable="yes">IPv4 address for Master interface:</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
-                                    <property name="fill">True</property>
                                     <property name="padding">5</property>
                                     <property name="position">0</property>
                                   </packing>
@@ -3528,27 +3090,22 @@
                                   <object class="GtkEntry" 
id="GNUNET_setup_vpn_master_interface_v4_ip_entry">
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
-                                    <property 
name="invisible_char">●</property>
-                                    <property 
name="primary_icon_activatable">False</property>
-                                    <property 
name="secondary_icon_activatable">False</property>
+                                    <property 
name="invisible_char">&#x25CF;</property>
                                     <property 
name="primary_icon_sensitive">True</property>
                                     <property 
name="secondary_icon_sensitive">True</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
-                                    <property name="fill">True</property>
                                     <property name="position">1</property>
                                   </packing>
                                 </child>
                                 <child>
                                   <object class="GtkLabel" 
id="GNUNET_setup_vpn_master_interface_v4_slash_label">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
                                     <property name="label" 
translatable="yes">/</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
-                                    <property name="fill">True</property>
                                     <property name="position">2</property>
                                   </packing>
                                 </child>
@@ -3556,38 +3113,31 @@
                                   <object class="GtkEntry" 
id="GNUNET_setup_vpn_master_interface_v4_mask_entry">
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
-                                    <property 
name="invisible_char">●</property>
-                                    <property 
name="primary_icon_activatable">False</property>
-                                    <property 
name="secondary_icon_activatable">False</property>
+                                    <property 
name="invisible_char">&#x25CF;</property>
                                     <property 
name="primary_icon_sensitive">True</property>
                                     <property 
name="secondary_icon_sensitive">True</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
-                                    <property name="fill">True</property>
                                     <property name="position">3</property>
                                   </packing>
                                 </child>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
-                                <property name="fill">True</property>
                                 <property name="position">1</property>
                               </packing>
                             </child>
                             <child>
                               <object class="GtkHBox" 
id="GNUNET_setup_vpn_master_interface_v6_hbox">
                                 <property name="visible">True</property>
-                                <property name="can_focus">False</property>
                                 <child>
                                   <object class="GtkLabel" 
id="GNUNET_setup_vpn_master_interface_v6_label">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
                                     <property name="label" 
translatable="yes">IPv6 address for Master interface: </property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
-                                    <property name="fill">True</property>
                                     <property name="padding">5</property>
                                     <property name="position">0</property>
                                   </packing>
@@ -3596,27 +3146,22 @@
                                   <object class="GtkEntry" 
id="GNUNET_setup_vpn_master_interface_v6_ip_entry">
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
-                                    <property 
name="invisible_char">●</property>
-                                    <property 
name="primary_icon_activatable">False</property>
-                                    <property 
name="secondary_icon_activatable">False</property>
+                                    <property 
name="invisible_char">&#x25CF;</property>
                                     <property 
name="primary_icon_sensitive">True</property>
                                     <property 
name="secondary_icon_sensitive">True</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
-                                    <property name="fill">True</property>
                                     <property name="position">1</property>
                                   </packing>
                                 </child>
                                 <child>
                                   <object class="GtkLabel" 
id="GNUNET_setup_vpn_master_interface_v6_slash_label">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
                                     <property name="label" 
translatable="yes">/</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
-                                    <property name="fill">True</property>
                                     <property name="position">2</property>
                                   </packing>
                                 </child>
@@ -3624,39 +3169,32 @@
                                   <object class="GtkSpinButton" 
id="GNUNET_setup_vpn_master_interface_v6_mask_spinbutton">
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
-                                    <property 
name="invisible_char">●</property>
-                                    <property 
name="primary_icon_activatable">False</property>
-                                    <property 
name="secondary_icon_activatable">False</property>
+                                    <property 
name="invisible_char">&#x25CF;</property>
                                     <property 
name="primary_icon_sensitive">True</property>
                                     <property 
name="secondary_icon_sensitive">True</property>
                                     <property 
name="adjustment">GNUNET_vpn_master_interface_mask_adjustment</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
-                                    <property name="fill">True</property>
                                     <property name="position">3</property>
                                   </packing>
                                 </child>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
-                                <property name="fill">True</property>
                                 <property name="position">2</property>
                               </packing>
                             </child>
                             <child>
                               <object class="GtkHBox" 
id="GNUNET_setup_vpn_master_vdns_hbox">
                                 <property name="visible">True</property>
-                                <property name="can_focus">False</property>
                                 <child>
                                   <object class="GtkLabel" 
id="GNUNET_setup_vpn_master_vdns_label">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
                                     <property name="label" 
translatable="yes">Virtual DNS Server:</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
-                                    <property name="fill">True</property>
                                     <property name="padding">5</property>
                                     <property name="position">0</property>
                                   </packing>
@@ -3665,22 +3203,18 @@
                                   <object class="GtkEntry" 
id="GNUNET_setup_vpn_master_vdns_server_entry">
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
-                                    <property 
name="invisible_char">●</property>
-                                    <property 
name="primary_icon_activatable">False</property>
-                                    <property 
name="secondary_icon_activatable">False</property>
+                                    <property 
name="invisible_char">&#x25CF;</property>
                                     <property 
name="primary_icon_sensitive">True</property>
                                     <property 
name="secondary_icon_sensitive">True</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
-                                    <property name="fill">True</property>
                                     <property name="position">1</property>
                                   </packing>
                                 </child>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
-                                <property name="fill">True</property>
                                 <property name="position">3</property>
                               </packing>
                             </child>
@@ -3691,7 +3225,6 @@
                     <child type="label">
                       <object class="GtkLabel" 
id="GNUNET_setup_vpn_master_interface_configuration_frame_label">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
                         <property name="label" translatable="yes">&lt;b&gt;VPN 
Master Interface Configuration&lt;/b&gt;</property>
                         <property name="use_markup">True</property>
                       </object>
@@ -3699,7 +3232,6 @@
                   </object>
                   <packing>
                     <property name="expand">False</property>
-                    <property name="fill">True</property>
                     <property name="padding">5</property>
                     <property name="position">0</property>
                   </packing>
@@ -3707,20 +3239,17 @@
                 <child>
                   <object class="GtkHBox" id="GNUNET_setup_vpn_master_hbox">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <child>
                       <object class="GtkCheckButton" 
id="GNUNET_setup_vpn_enable_vpn_exit_checkbutton">
                         <property name="label" translatable="yes">Enable VPN 
Exit</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
-                        <property name="use_action_appearance">False</property>
                         <property name="xalign">0</property>
                         <property name="draw_indicator">True</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
-                        <property name="fill">True</property>
                         <property name="padding">5</property>
                         <property name="position">0</property>
                       </packing>
@@ -3731,52 +3260,44 @@
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
-                        <property name="use_action_appearance">False</property>
                         <property name="xalign">0</property>
                         <property name="draw_indicator">True</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
-                        <property name="fill">True</property>
                         <property name="position">1</property>
                       </packing>
                     </child>
                   </object>
                   <packing>
                     <property name="expand">False</property>
-                    <property name="fill">True</property>
                     <property name="position">1</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkFrame" id="GNUNET_setup_vpn_exit_frame">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <property name="label_xalign">0</property>
                     <property name="shadow_type">none</property>
                     <child>
                       <object class="GtkAlignment" 
id="GNUNET_setup_vpn_exit_frame_alignment">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
                         <property name="left_padding">12</property>
                         <child>
                           <object class="GtkVBox" 
id="GNUNET_setup_vpn_exit_frame_vbox">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
+                            <property name="orientation">vertical</property>
                             <child>
                               <object class="GtkHBox" 
id="GNUNET_setup_vpn_exit_frame_hbox">
                                 <property name="visible">True</property>
-                                <property name="can_focus">False</property>
                                 <property name="spacing">5</property>
                                 <child>
                                   <object class="GtkLabel" 
id="GNUNET_setup_vpn_exit_interface_name_label">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
                                     <property name="label" 
translatable="yes">Exit interface name: </property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
-                                    <property name="fill">True</property>
                                     <property name="padding">5</property>
                                     <property name="position">0</property>
                                   </packing>
@@ -3785,15 +3306,11 @@
                                   <object class="GtkEntry" 
id="GNUNET_setup_vpn_exit_interface_name_entry">
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
-                                    <property 
name="invisible_char">●</property>
-                                    <property 
name="primary_icon_activatable">False</property>
-                                    <property 
name="secondary_icon_activatable">False</property>
+                                    <property 
name="invisible_char">&#x25CF;</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>
@@ -3803,13 +3320,11 @@
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property 
name="receives_default">False</property>
-                                    <property 
name="use_action_appearance">False</property>
                                     <property name="xalign">0</property>
                                     <property 
name="draw_indicator">True</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
-                                    <property name="fill">True</property>
                                     <property name="position">2</property>
                                   </packing>
                                 </child>
@@ -3819,13 +3334,11 @@
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property 
name="receives_default">False</property>
-                                    <property 
name="use_action_appearance">False</property>
                                     <property name="xalign">0</property>
                                     <property 
name="draw_indicator">True</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
-                                    <property name="fill">True</property>
                                     <property name="position">3</property>
                                   </packing>
                                 </child>
@@ -3839,16 +3352,13 @@
                             <child>
                               <object class="GtkHBox" 
id="GNUNET_setup_vpn_exit_ipv4_address_hbox">
                                 <property name="visible">True</property>
-                                <property name="can_focus">False</property>
                                 <child>
                                   <object class="GtkLabel" 
id="GNUNET_setup_vpn_exit_ipv4_address_label">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
                                     <property name="label" 
translatable="yes">IPv4 address for Exit interface: </property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
-                                    <property name="fill">True</property>
                                     <property name="padding">5</property>
                                     <property name="position">0</property>
                                   </packing>
@@ -3857,27 +3367,22 @@
                                   <object class="GtkEntry" 
id="GNUNET_setup_vpn_exit_interface_v4_ip_entry">
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
-                                    <property 
name="invisible_char">●</property>
-                                    <property 
name="primary_icon_activatable">False</property>
-                                    <property 
name="secondary_icon_activatable">False</property>
+                                    <property 
name="invisible_char">&#x25CF;</property>
                                     <property 
name="primary_icon_sensitive">True</property>
                                     <property 
name="secondary_icon_sensitive">True</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
-                                    <property name="fill">True</property>
                                     <property name="position">1</property>
                                   </packing>
                                 </child>
                                 <child>
                                   <object class="GtkLabel" 
id="GNUNET_setup_vpn_exit_ipv4_address_slash_label">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
                                     <property name="label" 
translatable="yes">/</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
-                                    <property name="fill">True</property>
                                     <property name="position">2</property>
                                   </packing>
                                 </child>
@@ -3885,38 +3390,31 @@
                                   <object class="GtkEntry" 
id="GNUNET_setup_vpn_exit_interface_v4_mask_entry">
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
-                                    <property 
name="invisible_char">●</property>
-                                    <property 
name="primary_icon_activatable">False</property>
-                                    <property 
name="secondary_icon_activatable">False</property>
+                                    <property 
name="invisible_char">&#x25CF;</property>
                                     <property 
name="primary_icon_sensitive">True</property>
                                     <property 
name="secondary_icon_sensitive">True</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
-                                    <property name="fill">True</property>
                                     <property name="position">3</property>
                                   </packing>
                                 </child>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
-                                <property name="fill">True</property>
                                 <property name="position">1</property>
                               </packing>
                             </child>
                             <child>
                               <object class="GtkHBox" 
id="GNUNET_setup_vpn_exit_ipv6_address_hbox">
                                 <property name="visible">True</property>
-                                <property name="can_focus">False</property>
                                 <child>
                                   <object class="GtkLabel" 
id="GNUNET_setup_vpn_exit_ipv6_address_label">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
                                     <property name="label" 
translatable="yes">IPv6 address for Exit interface: </property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
-                                    <property name="fill">True</property>
                                     <property name="padding">5</property>
                                     <property name="position">0</property>
                                   </packing>
@@ -3925,27 +3423,22 @@
                                   <object class="GtkEntry" 
id="GNUNET_setup_vpn_exit_interface_v6_ip_entry">
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
-                                    <property 
name="invisible_char">●</property>
-                                    <property 
name="primary_icon_activatable">False</property>
-                                    <property 
name="secondary_icon_activatable">False</property>
+                                    <property 
name="invisible_char">&#x25CF;</property>
                                     <property 
name="primary_icon_sensitive">True</property>
                                     <property 
name="secondary_icon_sensitive">True</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
-                                    <property name="fill">True</property>
                                     <property name="position">1</property>
                                   </packing>
                                 </child>
                                 <child>
                                   <object class="GtkLabel" 
id="GNUNET_setup_vpn_exit_ipv6_address_slash_label">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
                                     <property name="label" 
translatable="yes">/</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
-                                    <property name="fill">True</property>
                                     <property name="position">2</property>
                                   </packing>
                                 </child>
@@ -3953,23 +3446,19 @@
                                   <object class="GtkSpinButton" 
id="GNUNET_setup_vpn_exit_interface_v6_mask_spinbutton">
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
-                                    <property 
name="invisible_char">●</property>
-                                    <property 
name="primary_icon_activatable">False</property>
-                                    <property 
name="secondary_icon_activatable">False</property>
+                                    <property 
name="invisible_char">&#x25CF;</property>
                                     <property 
name="primary_icon_sensitive">True</property>
                                     <property 
name="secondary_icon_sensitive">True</property>
                                     <property 
name="adjustment">GNUNET_vpn_exit_interface_mask_adjustment</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
-                                    <property name="fill">True</property>
                                     <property name="position">3</property>
                                   </packing>
                                 </child>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
-                                <property name="fill">True</property>
                                 <property name="position">2</property>
                               </packing>
                             </child>
@@ -3980,7 +3469,6 @@
                     <child type="label">
                       <object class="GtkLabel" 
id="GNUNET_setup_vpn_exit_frame_label">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
                         <property name="label" 
translatable="yes">&lt;b&gt;GNUnet VPN Exit Interface&lt;/b&gt;</property>
                         <property name="use_markup">True</property>
                       </object>
@@ -3988,7 +3476,6 @@
                   </object>
                   <packing>
                     <property name="expand">False</property>
-                    <property name="fill">True</property>
                     <property name="padding">5</property>
                     <property name="position">2</property>
                   </packing>
@@ -3996,13 +3483,11 @@
                 <child>
                   <object class="GtkFrame" 
id="GNUNET_setup_vpn_service_configuration_frame">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <property name="label_xalign">0</property>
                     <property name="shadow_type">none</property>
                     <child>
                       <object class="GtkAlignment" 
id="GNUNET_setup_vpn_dns_service_configuration_frame_alignment">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
                         <property name="left_padding">12</property>
                         <child>
                           <object class="GtkScrolledWindow" 
id="GNUNET_setup_vpn_dns_service_scrolledwindow">
@@ -4013,7 +3498,6 @@
                             <child>
                               <object class="GtkViewport" 
id="GNUNET_setup_vpn_viewport">
                                 <property name="visible">True</property>
-                                <property name="can_focus">False</property>
                                 <child>
                                   <object class="GtkTreeView" 
id="GNUNET_setup_vpn_dns_service_treeview">
                                     <property name="visible">True</property>
@@ -4023,7 +3507,7 @@
                                     <child>
                                       <object class="GtkTreeViewColumn" 
id="GNUNET_setup_vpn_dns_service_dnsname_treeviewcolumn">
                                         <property 
name="sizing">autosize</property>
-                                        <property name="title" 
translatable="yes">DNS name</property>
+                                        <property name="title">DNS 
name</property>
                                         <property 
name="clickable">True</property>
                                         <property 
name="reorderable">True</property>
                                         <property 
name="sort_indicator">True</property>
@@ -4041,7 +3525,7 @@
                                     <child>
                                       <object class="GtkTreeViewColumn" 
id="GNUNET_setup_vpn_dns_service_tcpudp_treeviewcolumn">
                                         <property 
name="sizing">autosize</property>
-                                        <property name="title" 
translatable="yes">Prot.</property>
+                                        <property name="title">Prot.</property>
                                         <child>
                                           <object class="GtkCellRendererText" 
id="GNUNET_setup_vpn_dns_service_tcpudp_cellrenderertext">
                                             <property 
name="editable">True</property>
@@ -4055,7 +3539,7 @@
                                     <child>
                                       <object class="GtkTreeViewColumn" 
id="GNUNET_setup_vpn_dns_service_sourceport_treeviewcolumn">
                                         <property 
name="sizing">autosize</property>
-                                        <property name="title" 
translatable="yes">Source Port</property>
+                                        <property name="title">Source 
Port</property>
                                         <child>
                                           <object class="GtkCellRendererText" 
id="GNUNET_setup_vpn_dns_service_sourceport_cellrenderertext">
                                             <property 
name="editable">True</property>
@@ -4069,7 +3553,7 @@
                                     <child>
                                       <object class="GtkTreeViewColumn" 
id="GNUNET_setup_vpn_dns_service_destination_treeviewcolumn">
                                         <property 
name="resizable">True</property>
-                                        <property name="title" 
translatable="yes">Destination</property>
+                                        <property 
name="title">Destination</property>
                                         <property 
name="reorderable">True</property>
                                         <property 
name="sort_indicator">True</property>
                                         <property 
name="sort_column_id">2</property>
@@ -4107,15 +3591,12 @@
                     <child type="label">
                       <object class="GtkLabel" 
id="GNUNET_setup_vpn_dns_service_configuration_frame_label">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
                         <property name="label" translatable="yes">&lt;b&gt;DNS 
Services Configuration&lt;/b&gt;</property>
                         <property name="use_markup">True</property>
                       </object>
                     </child>
                   </object>
                   <packing>
-                    <property name="expand">True</property>
-                    <property name="fill">True</property>
                     <property name="padding">5</property>
                     <property name="position">3</property>
                   </packing>
@@ -4128,7 +3609,6 @@
             <child type="tab">
               <object class="GtkLabel" id="GNUNET_setup_vpn_label">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">_VPN</property>
                 <property name="use_underline">True</property>
               </object>
@@ -4139,8 +3619,6 @@
             </child>
           </object>
           <packing>
-            <property name="expand">True</property>
-            <property name="fill">True</property>
             <property name="position">1</property>
           </packing>
         </child>
@@ -4151,16 +3629,63 @@
             <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>
@@ -4170,119 +3695,111 @@
     </action-widgets>
   </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="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_vpn_exit_interface_mask_adjustment">
+    <property name="value">48</property>
     <property name="lower">1</property>
     <property name="upper">127</property>
-    <property name="value">48</property>
     <property name="step_increment">1</property>
     <property name="page_increment">10</property>
   </object>
   <object class="GtkAdjustment" 
id="GNUNET_vpn_master_interface_mask_adjustment">
+    <property name="value">48</property>
     <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>
@@ -4334,18 +3851,4 @@
     <property name="page_increment">10</property>
     <property name="page_size">10</property>
   </object>
-  <object class="GtkListStore" id="vpn_dns_config_liststore">
-    <columns>
-      <!-- column-name hostname -->
-      <column type="gchararray"/>
-      <!-- column-name sourceport -->
-      <column type="guint"/>
-      <!-- column-name targetport -->
-      <column type="guint"/>
-      <!-- column-name targethostname -->
-      <column type="gchararray"/>
-      <!-- column-name isudp -->
-      <column type="gchararray"/>
-    </columns>
-  </object>
 </interface>




reply via email to

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