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

[gnunet]

Author: grothoff
Date: 2011-12-23 17:16:40 +0100 (Fri, 23 Dec 2011)
New Revision: 18785

Modified:
   gnunet-gtk/src/fs/gnunet-fs-gtk.c
Log:
-fix keyword construction in combination with namespaces

Modified: gnunet-gtk/src/fs/gnunet-fs-gtk.c
===================================================================
--- gnunet-gtk/src/fs/gnunet-fs-gtk.c   2011-12-23 16:07:05 UTC (rev 18784)
+++ gnunet-gtk/src/fs/gnunet-fs-gtk.c   2011-12-23 16:16:40 UTC (rev 18785)
@@ -470,7 +470,6 @@
 
   GNUNET_HashCode *nsid = NULL;
   struct GNUNET_FS_Uri *uri;
-  gchar *root = NULL;
   char *emsg;
 
   builder = GTK_BUILDER (user_data);
@@ -498,17 +497,13 @@
     namespace_treepath = gtk_tree_row_reference_get_path (ref);
     if ( (NULL != namespace_treepath) &&
         (TRUE == gtk_tree_model_get_iter (namespace_model, &iter, 
namespace_treepath)) )
-      gtk_tree_model_get (namespace_model, &iter, 1, &nsid, 2, &root, -1);
+      gtk_tree_model_get (namespace_model, &iter, 1, &nsid, -1);
   }
   query_entry = GTK_ENTRY (gtk_builder_get_object (builder,
                                                   "main_window_search_entry"));
-  if (root == NULL)
-    root = g_strdup ("");
   entry_keywords = gtk_entry_get_text (query_entry);
-  /* FIXME: why is 'root' added here? Why is 'mime_keyword' not made 
mandatory? (+) */
-  keywords = g_strdup_printf ("%s %s %s", entry_keywords, mime_keyword, root);
+  keywords = g_strdup_printf ("%s +%s", entry_keywords, mime_keyword);
   g_free (mime_keyword);
-  g_free (root);
   if (nsid != NULL)
   {
     uri = GNUNET_FS_uri_sks_create_from_nsid (nsid, keywords);