-towards fixing 2132

1 files changed, 31 insertions, 6 deletions

diff --git a/src/fs/gnunet-fs-gtk_event-handler.c b/src/fs/gnunet-fs-gtk_event-handler.c
index 14d68675..dc313cd0 100644
--- a/src/fs/gnunet-fs-gtk_event-handler.c
+++ b/src/fs/gnunet-fs-gtk_event-handler.c
@@ -299,11 +299,6 @@ start_download (GtkTreeView *tree_view,
   int anonymity;
   int filename_is_absolute;
 
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Starting a %sdownload\n", 
-              is_recursive ? "recursive " : "");
-
-  GNUNET_assert (tab != NULL);
   tm = gtk_tree_view_get_model (tree_view);
   if (TRUE != gtk_tree_model_get_iter (tm, &iter, path))
   {
@@ -325,6 +320,8 @@ start_download (GtkTreeView *tree_view,
   if (!(GNUNET_FS_uri_test_chk (uri) || GNUNET_FS_uri_test_loc (uri)))
   {
     /* can only download chk/loc URIs, ignore */
+    /* break because in this case, we should not have even gotten here */
+    GNUNET_break (0);
     return;
   }
 
@@ -456,7 +453,34 @@ GNUNET_FS_GTK_search_treeview_row_activated (GtkTreeView * tree_view,
                                              gpointer user_data)
 {
   struct SearchTab *tab = user_data;
+  struct GNUNET_FS_Uri *uri;
+  GtkTreeModel *tm;
+  GtkTreeIter iter;
 
+  tm = gtk_tree_view_get_model (tree_view);
+  if (TRUE != gtk_tree_model_get_iter (tm, &iter, path))
+  {
+    GNUNET_break (0);
+    return;
+  }
+  gtk_tree_model_get (tm, &iter, 1, &uri, -1);
+  if (NULL == uri)
+  {
+    /* user clicked on directory that was opened (not downloaded!), so we
+       have no URI and downloading makes no sense. Ignore! */
+    return;
+  }
+  if (GNUNET_FS_uri_test_ksk (uri))
+  {
+    /* FIXME-FEATURE: copy keywords to search bar (and select 'no' namespace) */
+    return;
+  }
+  if (GNUNET_FS_uri_test_sks (uri))
+  {
+    /* FIXME-FEATURE: select namespace and copy root to search bar */
+    return;
+  }
+  /* must be chk/loc URI, start download */
   start_download (tree_view, path, tab, GNUNET_NO, GNUNET_NO);
 }
 
@@ -627,7 +651,8 @@ search_list_popup (GtkTreeModel *tm,
   spc->sr = sr;
   menu = GTK_MENU (gtk_menu_new ());
   if ( (NULL == sr->download) &&
-       (NULL != uri) )
+       (NULL != uri) &&
+       ( (GNUNET_FS_uri_test_chk (uri) || GNUNET_FS_uri_test_loc (uri))) )
   {
     /* only display download menus if there is a URI */
     child = gtk_menu_item_new_with_label (_("_Download"));