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

[gnunet]

Author: grothoff
Date: 2011-12-23 17:04:13 +0100 (Fri, 23 Dec 2011)
New Revision: 18783

Modified:
   gnunet-gtk/src/fs/gnunet-fs-gtk.c
Log:
-fix unchecked return value, open questions for LRN

Modified: gnunet-gtk/src/fs/gnunet-fs-gtk.c
===================================================================
--- gnunet-gtk/src/fs/gnunet-fs-gtk.c   2011-12-23 15:59:47 UTC (rev 18782)
+++ gnunet-gtk/src/fs/gnunet-fs-gtk.c   2011-12-23 16:04:13 UTC (rev 18783)
@@ -496,19 +496,16 @@
   {
     namespace_model = gtk_tree_row_reference_get_model (ref);
     namespace_treepath = gtk_tree_row_reference_get_path (ref);
-    gtk_tree_model_get_iter (namespace_model, &iter, namespace_treepath);
+    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);
   }
-
   query_entry = GTK_ENTRY (gtk_builder_get_object (builder,
-      "main_window_search_entry"));
-
-  if (namespace_treepath != NULL)
-    gtk_tree_model_get (namespace_model, &iter, 1, &nsid, 2, &root, -1);
+                                                  "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);
   g_free (mime_keyword);
   g_free (root);