1 files changed, 206 insertions, 115 deletions

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