1 files changed, 46 insertions, 44 deletions

diff --git a/contrib/gnunet_fs_gtk_main_window.glade b/contrib/gnunet_fs_gtk_main_window.glade
index ac572bb2..5183ba9c 100644
--- a/contrib/gnunet_fs_gtk_main_window.glade
+++ b/contrib/gnunet_fs_gtk_main_window.glade
@@ -676,38 +676,6 @@
       <column type="gchararray"/>
     </columns>
   </object>
-  <object class="GtkAdjustment" id="adjustment1">
-    <property name="upper">100</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
-    <property name="page_size">10</property>
-  </object>
-  <object class="GtkAdjustment" id="adjustment2">
-    <property name="upper">100</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
-    <property name="page_size">10</property>
-  </object>
-  <object class="GtkImage" id="image3">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="stock">gtk-new</property>
-  </object>
-  <object class="GtkImage" id="image4">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="stock">gtk-find</property>
-  </object>
-  <object class="GtkImage" id="image5">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="stock">gtk-go-down</property>
-  </object>
-  <object class="GtkImage" id="image6">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="stock">gtk-index</property>
-  </object>
   <object class="GtkListStore" id="GNUNET_GTK_peer_info_list_store">
     <columns>
       <!-- column-name peer_identity -->
@@ -722,6 +690,18 @@
       <column type="guint64"/>
     </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>
@@ -744,6 +724,26 @@
     <property name="can_focus">False</property>
     <property name="stock">gtk-go-up</property>
   </object>
+  <object class="GtkImage" id="image3">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="stock">gtk-new</property>
+  </object>
+  <object class="GtkImage" id="image4">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="stock">gtk-find</property>
+  </object>
+  <object class="GtkImage" id="image5">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="stock">gtk-go-down</property>
+  </object>
+  <object class="GtkImage" id="image6">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="stock">gtk-index</property>
+  </object>
   <object class="GtkImage" id="image7">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
@@ -786,6 +786,14 @@
       </row>
     </data>
   </object>
+  <object class="GtkSizeGroup" id="enties_and_comboboxes_sizegroup">
+    <property name="mode">vertical</property>
+    <widgets>
+      <widget name="main_window_search_entry"/>
+      <widget name="main_window_search_anonymity_combobox"/>
+      <widget name="main_window_search_mime_combobox"/>
+    </widgets>
+  </object>
   <object class="GtkListStore" id="main_window_search_mime_liststore">
     <columns>
       <!-- column-name MIME -->
@@ -830,21 +838,13 @@
       </row>
     </data>
   </object>
-  <object class="GtkSizeGroup" id="enties_and_comboboxes_sizegroup">
-    <property name="mode">vertical</property>
-    <widgets>
-      <widget name="main_window_search_entry"/>
-      <widget name="main_window_search_anonymity_combobox"/>
-      <widget name="main_window_search_mime_combobox"/>
-    </widgets>
-  </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 KeyTextual -->
+      <!-- column-name Root -->
       <column type="gchararray"/>
       <!-- column-name Tooltip -->
       <column type="gchararray"/>
@@ -853,7 +853,6 @@
   <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="type">popup</property>
     <property name="resizable">False</property>
     <property name="type_hint">dropdown-menu</property>
     <property name="skip_taskbar_hint">True</property>
@@ -869,12 +868,15 @@
       <object class="GtkTreeView" id="namespace_selector_treeview">
         <property name="visible">True</property>
         <property name="can_focus">True</property>
+        <property name="is_focus">True</property>
         <property name="model">main_window_search_namespace_treestore</property>
         <property name="headers_clickable">False</property>
         <property name="search_column">0</property>
+        <property name="hover_selection">True</property>
         <property name="hover_expand">True</property>
         <property name="tooltip_column">3</property>
-        <signal name="cursor-changed" handler="namespace_selector_treeview_cursor_changed_cb" swapped="no"/>
+        <signal name="button-press-event" handler="namespace_selector_treeview_button_press_event_cb" swapped="no"/>
+        <signal name="button-release-event" handler="namespace_selector_treeview_button_release_event_cb" swapped="no"/>
         <child>
           <object class="GtkTreeViewColumn" id="name_column">
             <property name="sizing">autosize</property>
@@ -890,7 +892,7 @@
         <child>
           <object class="GtkTreeViewColumn" id="key_column">
             <property name="sizing">autosize</property>
-            <property name="title" translatable="yes">Key</property>
+            <property name="title" translatable="yes">Root</property>
             <child>
               <object class="GtkCellRendererText" id="namespace_selector_key_column_text_cell"/>
               <attributes>