[GNUnet-SVN] r18789 - gnunet-gtk/src/fs

[gnunet]

Author: grothoff
Date: 2011-12-23 17:34:10 +0100 (Fri, 23 Dec 2011)
New Revision: 18789

Modified:
   gnunet-gtk/src/fs/gnunet-fs-gtk.c
Log:
-LRN: reset search query on namespace selection to namespace root

Modified: gnunet-gtk/src/fs/gnunet-fs-gtk.c
===================================================================
--- gnunet-gtk/src/fs/gnunet-fs-gtk.c   2011-12-23 16:23:25 UTC (rev 18788)
+++ gnunet-gtk/src/fs/gnunet-fs-gtk.c   2011-12-23 16:34:10 UTC (rev 18789)
@@ -354,6 +354,7 @@
   GtkTreeModel *model;
   gchar *value;
   GtkTreePath *treepath;
+  GtkEntry *search_entry;
   GtkTreeRowReference *ref, *old;
 
   builder = GTK_BUILDER (user_data);
@@ -362,6 +363,10 @@
   if (!toggle_button)
     return;
 
+  search_entry = GTK_ENTRY (gtk_builder_get_object (builder, 
"main_window_search_entry"));
+  if (!search_entry)
+    return;
+
   if (!get_selected_namespace_treepath_iter_model_widget (builder, &treepath, 
NULL, &model, NULL))
     return;
   ref = gtk_tree_row_reference_new (model, treepath);
@@ -376,8 +381,17 @@
     return;
 
   if (GNUNET_GTK_get_tree_string (GTK_TREE_VIEW (widget), treepath, 0,
-      &value))
+      &value) && value != NULL)
+  {
     gtk_label_set_text (sel_namespace_label, value);
+    g_free (value);
+  }
+  if (GNUNET_GTK_get_tree_string (GTK_TREE_VIEW (widget), treepath, 2,
+      &value) && value != NULL)
+  {
+    gtk_entry_set_text (search_entry, value);
+    g_free (value);
+  }
 
   gtk_tree_path_free (treepath);