1 files changed, 56 insertions, 51 deletions

diff --git a/contrib/gnunet_namestore_gtk_main_window.glade b/contrib/gnunet_namestore_gtk_main_window.glade
index 1082c510..e81fbf56 100644
--- a/contrib/gnunet_namestore_gtk_main_window.glade
+++ b/contrib/gnunet_namestore_gtk_main_window.glade
@@ -3,35 +3,39 @@
   <requires lib="gtk+" version="2.20"/>
   <!-- interface-naming-policy toplevel-contextual -->
   <object class="GtkDialog" id="gnunet_namestore_gtk_dialog">
+    <property name="width_request">800</property>
+    <property name="height_request">600</property>
+    <property name="visible">True</property>
     <property name="can_focus">False</property>
     <property name="border_width">5</property>
-    <property name="title" translatable="yes">gnunet-setup</property>
+    <property name="title" translatable="yes">gnunet-namestore-gtk</property>
     <property name="window_position">center</property>
     <property name="icon_name">preferences-system</property>
     <property name="type_hint">normal</property>
-    <signal name="destroy" handler="GNUNET_NAMESTORE_GTK_quit_cb" swapped="no"/>
+    <signal name="destroy" handler="gnunet_namestore_gtk_quit_cb" swapped="no"/>
     <child internal-child="vbox">
       <object class="GtkVBox" id="gnunet_namestore_gtk_dialog-vbox">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="spacing">2</property>
         <child>
-          <object class="GtkVBox" id="gnunet_namestore_gtk_gns_vbox">
+          <object class="GtkVBox" id="gnunet_namestore_gtk_vbox">
+            <property name="visible">True</property>
             <property name="can_focus">False</property>
             <child>
-              <object class="GtkHBox" id="gnunet_namestore_gtk_gns_top_hbox">
+              <object class="GtkHBox" id="gnunet_namestore_gtk_top_hbox">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <child>
-                  <object class="GtkVBox" id="gnunet_namestore_gtk_gns_zone_vbox">
+                  <object class="GtkVBox" id="gnunet_namestore_gtk_zone_vbox">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <child>
-                      <object class="GtkHBox" id="gnunet_namestore_gtk_gns_zone_label_hbox">
+                      <object class="GtkHBox" id="gnunet_namestore_gtk_zone_label_hbox">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <child>
-                          <object class="GtkLabel" id="gnunet_namestore_gtk_gns_zone_label">
+                          <object class="GtkLabel" id="gnunet_namestore_gtk_zone_label">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="label" translatable="yes">&lt;b&gt;SET TO PUBLIC KEY OF THE ZONE&lt;/b&gt;</property>
@@ -44,14 +48,14 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkButton" id="gnunet_namestore_gtk_gns_public_key_copy_button">
+                          <object class="GtkButton" id="gnunet_namestore_gtk_public_key_copy_button">
                             <property name="label">gtk-copy</property>
                             <property name="use_action_appearance">False</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
                             <property name="use_stock">True</property>
-                            <signal name="clicked" handler="gnunet_namestore_gtk_gns_public_key_copy_button_clicked_cb" swapped="no"/>
+                            <signal name="clicked" handler="gnunet_namestore_gtk_public_key_copy_button_clicked_cb" swapped="no"/>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -68,11 +72,11 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkHBox" id="gnunet_namestore_gtk_gns_pseu_hbox">
+                      <object class="GtkHBox" id="gnunet_namestore_gtk_pseu_hbox">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <child>
-                          <object class="GtkLabel" id="gnunet_namestore_gtk_gns_pseu_label">
+                          <object class="GtkLabel" id="gnunet_namestore_gtk_pseu_label">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="label" translatable="yes">Preferred zone name (PSEU):</property>
@@ -85,7 +89,7 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkEntry" id="gnunet_namestore_gtk_gns_pseu_entry">
+                          <object class="GtkEntry" id="gnunet_namestore_gtk_pseu_entry">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="max_length">63</property>
@@ -96,7 +100,7 @@
                             <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_namestore_gtk_gns_pseu_entry_changed_cb" swapped="no"/>
+                            <signal name="changed" handler="gnunet_namestore_gtk_pseu_entry_changed_cb" swapped="no"/>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -113,12 +117,12 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkHButtonBox" id="gnunet_namestore_gtk_gns_zone_selection_hbuttonbox">
+                      <object class="GtkHButtonBox" id="gnunet_namestore_gtk_zone_selection_hbuttonbox">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="layout_style">center</property>
                         <child>
-                          <object class="GtkRadioButton" id="gnunet_namestore_gtk_gns_master_zone_selection_radiobutton">
+                          <object class="GtkRadioButton" id="gnunet_namestore_gtk_master_zone_selection_radiobutton">
                             <property name="label" translatable="yes">_Master Zone</property>
                             <property name="use_action_appearance">False</property>
                             <property name="visible">True</property>
@@ -127,7 +131,7 @@
                             <property name="use_underline">True</property>
                             <property name="active">True</property>
                             <property name="draw_indicator">True</property>
-                            <signal name="toggled" handler="gnunet_namestore_gtk_gns_master_zone_selection_radiobutton_toggled_cb" swapped="no"/>
+                            <signal name="toggled" handler="gnunet_namestore_gtk_master_zone_selection_radiobutton_toggled_cb" swapped="no"/>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -137,7 +141,7 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkRadioButton" id="gnunet_namestore_gtk_gns_private_zone_selection_radiobutton">
+                          <object class="GtkRadioButton" id="gnunet_namestore_gtk_private_zone_selection_radiobutton">
                             <property name="label" translatable="yes">_Private Zone</property>
                             <property name="use_action_appearance">False</property>
                             <property name="visible">True</property>
@@ -145,8 +149,8 @@
                             <property name="receives_default">False</property>
                             <property name="use_underline">True</property>
                             <property name="draw_indicator">True</property>
-                            <property name="group">gnunet_namestore_gtk_gns_master_zone_selection_radiobutton</property>
-                            <signal name="toggled" handler="gnunet_namestore_gtk_gns_private_zone_selection_radiobutton_toggled_cb" swapped="no"/>
+                            <property name="group">gnunet_namestore_gtk_master_zone_selection_radiobutton</property>
+                            <signal name="toggled" handler="gnunet_namestore_gtk_private_zone_selection_radiobutton_toggled_cb" swapped="no"/>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -156,7 +160,7 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkRadioButton" id="gnunet_namestore_gtk_gns_shorten_zone_selection_radiobutton">
+                          <object class="GtkRadioButton" id="gnunet_namestore_gtk_shorten_zone_selection_radiobutton">
                             <property name="label" translatable="yes">_Shorten Zone</property>
                             <property name="use_action_appearance">False</property>
                             <property name="visible">True</property>
@@ -164,8 +168,8 @@
                             <property name="receives_default">False</property>
                             <property name="use_underline">True</property>
                             <property name="draw_indicator">True</property>
-                            <property name="group">gnunet_namestore_gtk_gns_master_zone_selection_radiobutton</property>
-                            <signal name="toggled" handler="gnunet_namestore_gtk_gns_shorten_zone_selection_radiobutton_toggled_cb" swapped="no"/>
+                            <property name="group">gnunet_namestore_gtk_master_zone_selection_radiobutton</property>
+                            <signal name="toggled" handler="gnunet_namestore_gtk_shorten_zone_selection_radiobutton_toggled_cb" swapped="no"/>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -190,7 +194,7 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkVSeparator" id="gnunet_namestore_gtk_gns_qr_vseparator">
+                  <object class="GtkVSeparator" id="gnunet_namestore_gtk_qr_vseparator">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                   </object>
@@ -201,7 +205,7 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkImage" id="gnunet_namestore_gtk_gns_qr_image">
+                  <object class="GtkImage" id="gnunet_namestore_gtk_qr_image">
                     <property name="width_request">64</property>
                     <property name="height_request">64</property>
                     <property name="visible">True</property>
@@ -216,14 +220,14 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkButton" id="gnunet_namestore_gtk_gns_qr_saveas_button">
+                  <object class="GtkButton" id="gnunet_namestore_gtk_qr_saveas_button">
                     <property name="label">gtk-save-as</property>
                     <property name="use_action_appearance">False</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <property name="use_stock">True</property>
-                    <signal name="clicked" handler="gnunet_namestore_gtk_gns_qr_saveas_button_clicked_cb" swapped="no"/>
+                    <signal name="clicked" handler="gnunet_namestore_gtk_qr_saveas_button_clicked_cb" swapped="no"/>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -240,7 +244,7 @@
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="gnunet_namestore_gtk_gns_status_label">
+              <object class="GtkLabel" id="gnunet_namestore_gtk_status_label">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="label" translatable="yes">&lt;b&gt;&lt;big&gt;Loading...&lt;/big&gt;&lt;/b&gt;</property>
@@ -253,29 +257,29 @@
               </packing>
             </child>
             <child>
-              <object class="GtkScrolledWindow" id="gnunet_namestore_gtk_gns_main_scrolledwindow">
+              <object class="GtkScrolledWindow" id="gnunet_namestore_gtk_scrolledwindow">
                 <property name="can_focus">True</property>
                 <property name="hscrollbar_policy">automatic</property>
                 <property name="vscrollbar_policy">automatic</property>
                 <child>
-                  <object class="GtkTreeView" id="gnunet_namestore_gtk_gns_main_treeview">
+                  <object class="GtkTreeView" id="gnunet_namestore_gtk_treeview">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="model">gnunet_namestore_gtk_gns_treestore</property>
+                    <property name="model">gnunet_namestore_gtk_treestore</property>
                     <property name="search_column">0</property>
-                    <signal name="button-press-event" handler="gnunet_namestore_gtk_gns_main_treeview_button_press_event_cb" swapped="no"/>
-                    <signal name="key-press-event" handler="gnunet_namestore_gtk_gns_main_treeview_key_press_event_cb" swapped="no"/>
-                    <signal name="popup-menu" handler="gnunet_namestore_gtk_gns_main_treeview_popup_menu_cb" swapped="no"/>
+                    <signal name="button-press-event" handler="gnunet_namestore_gtk_treeview_button_press_event_cb" swapped="no"/>
+                    <signal name="key-press-event" handler="gnunet_namestore_gtk_treeview_key_press_event_cb" swapped="no"/>
+                    <signal name="popup-menu" handler="gnunet_namestore_gtk_treeview_popup_menu_cb" swapped="no"/>
                     <child>
-                      <object class="GtkTreeViewColumn" id="gnunet_namestore_gtk_gns_name_treeviewcolumn">
+                      <object class="GtkTreeViewColumn" id="gnunet_namestore_gtk_name_treeviewcolumn">
                         <property name="title">Name</property>
                         <property name="clickable">True</property>
                         <property name="reorderable">True</property>
                         <property name="sort_indicator">True</property>
                         <property name="sort_column_id">0</property>
                         <child>
-                          <object class="GtkCellRendererText" id="gnunet_namestore_gtk_gns_name_cellrenderertext">
-                            <signal name="edited" handler="gnunet_namestore_gtk_gns_name_cellrenderertext_edited_cb" swapped="no"/>
+                          <object class="GtkCellRendererText" id="gnunet_namestore_gtk_name_cellrenderertext">
+                            <signal name="edited" handler="gnunet_namestore_gtk_name_cellrenderertext_edited_cb" swapped="no"/>
                           </object>
                           <attributes>
                             <attribute name="visible">9</attribute>
@@ -287,7 +291,7 @@
                       </object>
                     </child>
                     <child>
-                      <object class="GtkTreeViewColumn" id="gnunet_namestore_gtk_gns_type_treeviewcolumn">
+                      <object class="GtkTreeViewColumn" id="gnunet_namestore_gtk_type_treeviewcolumn">
                         <property name="sizing">autosize</property>
                         <property name="fixed_width">90</property>
                         <property name="title">Type</property>
@@ -296,10 +300,10 @@
                         <property name="sort_indicator">True</property>
                         <property name="sort_column_id">3</property>
                         <child>
-                          <object class="GtkCellRendererCombo" id="gnunet_namestore_gtk_gns_type_cellrenderercombo">
-                            <property name="model">gnunet_namestore_gtk_gns_type_liststore</property>
+                          <object class="GtkCellRendererCombo" id="gnunet_namestore_gtk_type_cellrenderercombo">
+                            <property name="model">gnunet_namestore_gtk_type_liststore</property>
                             <property name="text_column">1</property>
-                            <signal name="edited" handler="gnunet_namestore_gtk_gns_type_cellrenderercombo_edited_cb" swapped="no"/>
+                            <signal name="edited" handler="gnunet_namestore_gtk_type_cellrenderercombo_edited_cb" swapped="no"/>
                           </object>
                           <attributes>
                             <attribute name="visible">10</attribute>
@@ -310,14 +314,14 @@
                       </object>
                     </child>
                     <child>
-                      <object class="GtkTreeViewColumn" id="gnunet_namestore_gtk_gns_value_treeviewcolumn">
+                      <object class="GtkTreeViewColumn" id="gnunet_namestore_gtk_value_treeviewcolumn">
                         <property name="sizing">autosize</property>
                         <property name="title">Value</property>
                         <property name="expand">True</property>
                         <property name="clickable">True</property>
                         <property name="sort_column_id">7</property>
                         <child>
-                          <object class="GtkCellRendererText" id="gnunet_namestore_gtk_gns_value_cellrenderertext"/>
+                          <object class="GtkCellRendererText" id="gnunet_namestore_gtk_value_cellrenderertext"/>
                           <attributes>
                             <attribute name="sensitive">11</attribute>
                             <attribute name="visible">10</attribute>
@@ -328,14 +332,14 @@
                       </object>
                     </child>
                     <child>
-                      <object class="GtkTreeViewColumn" id="gnunet_namestore_gtk_gns_expiration_treeviewcolumn">
+                      <object class="GtkTreeViewColumn" id="gnunet_namestore_gtk_expiration_treeviewcolumn">
                         <property name="title">Expiration</property>
                         <property name="clickable">True</property>
                         <property name="reorderable">True</property>
                         <property name="sort_indicator">True</property>
                         <property name="sort_column_id">4</property>
                         <child>
-                          <object class="GtkCellRendererText" id="gnunet_namestore_gtk_gns_expiration_cellrenderertext"/>
+                          <object class="GtkCellRendererText" id="gnunet_namestore_gtk_expiration_cellrenderertext"/>
                           <attributes>
                             <attribute name="sensitive">11</attribute>
                             <attribute name="visible">10</attribute>
@@ -346,13 +350,13 @@
                       </object>
                     </child>
                     <child>
-                      <object class="GtkTreeViewColumn" id="gnunet_namestore_gtk_gns_ispublic_treeviewcolumn">
+                      <object class="GtkTreeViewColumn" id="gnunet_namestore_gtk_ispublic_treeviewcolumn">
                         <property name="sizing">fixed</property>
                         <property name="fixed_width">50</property>
                         <property name="title">Public</property>
                         <property name="clickable">True</property>
                         <child>
-                          <object class="GtkCellRendererToggle" id="gnunet_namestore_gtk_gns_ispublic_cellrenderertoggle">
+                          <object class="GtkCellRendererToggle" id="gnunet_namestore_gtk_ispublic_cellrenderertoggle">
                             <property name="sensitive">False</property>
                           </object>
                           <attributes>
@@ -428,6 +432,7 @@
           <packing>
             <property name="expand">False</property>
             <property name="fill">True</property>
+            <property name="pack_type">end</property>
             <property name="position">1</property>
           </packing>
         </child>
@@ -439,21 +444,21 @@
       <action-widget response="-3">gnunet_namestore_gtk_save_button</action-widget>
     </action-widgets>
   </object>
-  <object class="GtkMenu" id="gnunet_namestore_gtk_gns_edit_popup_menu">
+  <object class="GtkMenu" id="gnunet_namestore_gtk_edit_popup_menu">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <child>
-      <object class="GtkMenuItem" id="gnunet_namestore_gtk_gns_popup_edit_button">
+      <object class="GtkMenuItem" id="gnunet_namestore_gtk_popup_edit_button">
         <property name="use_action_appearance">False</property>
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="tooltip_text" translatable="yes">Edit GNS entry</property>
         <property name="label" translatable="yes">Edit</property>
-        <signal name="activate" handler="gnunet_namestore_gtk_gns_popup_edit_button_activate_cb" swapped="no"/>
+        <signal name="activate" handler="gnunet_namestore_gtk_popup_edit_button_activate_cb" swapped="no"/>
       </object>
     </child>
   </object>
-  <object class="GtkTreeStore" id="gnunet_namestore_gtk_gns_treestore">
+  <object class="GtkTreeStore" id="gnunet_namestore_gtk_treestore">
     <columns>
       <!-- column-name name -->
       <column type="gchararray"/>
@@ -493,7 +498,7 @@
       <column type="guint"/>
     </columns>
   </object>
-  <object class="GtkListStore" id="gnunet_namestore_gtk_gns_type_liststore">
+  <object class="GtkListStore" id="gnunet_namestore_gtk_type_liststore">
     <columns>
       <!-- column-name type -->
       <column type="guint"/>