done

2 files changed, 51 insertions, 16 deletions

diff --git a/contrib/search_dialog.glade b/contrib/search_dialog.glade
index 6f05811b..59a6025d 100644
--- a/contrib/search_dialog.glade
+++ b/contrib/search_dialog.glade
@@ -2,17 +2,11 @@
 <interface>
   <requires lib="gtk+" version="2.20"/>
   <!-- interface-naming-policy project-wide -->
-  <object class="GtkListStore" id="GNUNET_GTK_namespace_list_store">
-    <columns>
-      <!-- column-name unique_name -->
-      <column type="gchararray"/>
-      <!-- column-name namespace_root -->
-      <column type="gchararray"/>
-      <!-- column-name nsid -->
-      <column type="gpointer"/>
-      <!-- column-name namespace_description -->
-      <column type="gchararray"/>
-    </columns>
+  <object class="GtkAdjustment" id="GNUNET_GTK_search_anonymity_adjustment">
+    <property name="upper">100000</property>
+    <property name="value">1</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
   </object>
   <object class="GtkDialog" id="GNUNET_GTK_search_dialog">
     <property name="width_request">500</property>
@@ -106,6 +100,7 @@
             <property name="model">GNUNET_GTK_namespace_list_store</property>
             <property name="reorderable">True</property>
             <property name="rules_hint">True</property>
+            <signal name="row-activated" handler="GNUNET_GTK_search_dialog_namespace_tree_view_row_activated_cb" swapped="no"/>
             <child>
               <object class="GtkTreeViewColumn" id="GNUNET_GTK_search_dialog_namespace_name_column">
                 <property name="resizable">True</property>
@@ -207,10 +202,16 @@
       <action-widget response="0">GNUNET_GTK_search_dialog_search_button</action-widget>
     </action-widgets>
   </object>
-  <object class="GtkAdjustment" id="GNUNET_GTK_search_anonymity_adjustment">
-    <property name="upper">100000</property>
-    <property name="value">1</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
+  <object class="GtkListStore" id="GNUNET_GTK_namespace_list_store">
+    <columns>
+      <!-- column-name unique_name -->
+      <column type="gchararray"/>
+      <!-- column-name namespace_root -->
+      <column type="gchararray"/>
+      <!-- column-name nsid -->
+      <column type="gpointer"/>
+      <!-- column-name namespace_description -->
+      <column type="gchararray"/>
+    </columns>
   </object>
 </interface>
diff --git a/src/main_window_file_search.c b/src/main_window_file_search.c
index 0de40d62..4911cbcb 100644
--- a/src/main_window_file_search.c
+++ b/src/main_window_file_search.c
@@ -30,6 +30,40 @@
 static GtkBuilder *builder;
 
 
+/**
+ * User double-clicked on namespace or pressed enter;
+ * move namespace root to the 'keywords' line.
+ */
+void 
+GNUNET_GTK_search_dialog_namespace_tree_view_row_activated_cb (GtkTreeView       *tree_view,
+                                                               GtkTreePath       *path,
+                                                               GtkTreeViewColumn *column,
+                                                               gpointer           user_data)
+{
+  GtkTreeModel *ls;
+  GtkTreeSelection *sel;
+  GtkEntry *query;
+  GtkTreeIter iter;
+  char *root;
+
+  query = GTK_ENTRY (gtk_builder_get_object (builder,
+                                             "GNUNET_GTK_search_dialog_keyword_entry"));
+  sel = gtk_tree_view_get_selection (tree_view); 
+  if (TRUE ==
+      gtk_tree_selection_get_selected (sel,
+                                       &ls,
+                                       &iter))
+    {
+      gtk_tree_model_get (ls, &iter,
+                          1, &root,
+                          -1);
+      gtk_entry_set_text (query,
+                          root);
+      GNUNET_free (root);
+    }
+}
+
+
 void
 GNUNET_GTK_search_dialog_search_button_clicked_cb (GtkWidget * dummy, 
                                                    gpointer data)