1 files changed, 316 insertions, 312 deletions

diff --git a/src/fs/gnunet-fs-gtk_event-handler.c b/src/fs/gnunet-fs-gtk_event-handler.c
index ec1f60ad..50694879 100644
--- a/src/fs/gnunet-fs-gtk_event-handler.c
+++ b/src/fs/gnunet-fs-gtk_event-handler.c
@@ -266,8 +266,8 @@ static struct SearchTab *search_tab_head;
 static struct SearchTab *search_tab_tail;
 
 /**
- * Special tab we use to for downloads-by-URIs and downloads
- * where the search tab has been closed ("parent lost").
+ * Special tab we use to for downloads-by-URIs and
+ * opened directory files.
  */
 static struct SearchTab *uri_tab;
 
@@ -284,7 +284,7 @@ static struct SearchTab *current_search_tab = NULL;
 /**
  * Currently selected row in a search tab.
  */
-static GtkTreePath *current_selected_search_result = NULL;
+static GtkTreePath *current_selected_search_result;
 
 /**
  * Animation to display while publishing.
@@ -655,7 +655,8 @@ get_suggested_filename_anonymity2 (GtkTreeModel *tm,
 struct SearchListPopupContext
 {
   /**
-   * Tab where the search list popup was created.
+   * Tab where the search list popup was created, NULL for
+   * the downloads list.
    */
   struct SearchTab *tab;
 
@@ -703,6 +704,74 @@ GNUNET_FS_GTK_search_treeview_cursor_changed (GtkTreeView *tv,
 
 
 /**
+ * Setup an entry for the download in the download list.
+ * Initializes the 'rr' field of @a de.
+ *
+ * @param de the download entry to initialize
+ * @param pde download entry of the parent, or NULL for top-level
+ * @param sr associated search result to add to the model
+ */
+static void
+setup_download_list_entry (struct DownloadEntry *de,
+                           struct DownloadEntry *pde,
+                           struct SearchResult *sr)
+{
+  GtkTreeIter download_iter;
+  GtkTreeIter download_piter;
+  GtkTreePath *path;
+
+  /* created row in download list */
+  if (NULL == pde)
+  {
+    /* top level */
+    gtk_tree_store_insert (downloads_treestore,
+                           &download_iter,
+                           NULL,
+                           G_MAXINT);
+  }
+  else
+  {
+    /* below parent */
+    path = gtk_tree_row_reference_get_path (pde->rr);
+    GNUNET_assert (gtk_tree_model_get_iter (GTK_TREE_MODEL (downloads_treestore),
+                                            &download_piter, path));
+    gtk_tree_path_free (path);
+    gtk_tree_store_insert (downloads_treestore,
+                           &download_iter,
+                           &download_piter,
+                           G_MAXINT);
+  }
+  gtk_tree_store_set (downloads_treestore, &download_iter,
+                      SEARCH_TAB_MC_SEARCH_RESULT, sr,
+                      -1);
+  path = gtk_tree_model_get_path (GTK_TREE_MODEL (downloads_treestore),
+                                  &download_iter);
+  de->rr = gtk_tree_row_reference_new (GTK_TREE_MODEL (downloads_treestore),
+                                       path);
+  gtk_tree_path_free (path);
+}
+
+
+/**
+ * Obtain the iterator for the respective download entry.
+ *
+ * @param de the download entry
+ * @param[OUT] iter set to the respective position in the #downloads_treestore
+ */
+static void
+get_download_list_entry (struct DownloadEntry *de,
+                         GtkTreeIter *iter)
+{
+  GtkTreePath *path;
+
+  path = gtk_tree_row_reference_get_path (de->rr);
+  GNUNET_assert (gtk_tree_model_get_iter (GTK_TREE_MODEL (downloads_treestore),
+                                          iter, path));
+  gtk_tree_path_free (path);
+}
+
+
+/**
  *
  * @param save_as #GNUNET_YES to open SaveAs dialog, #GNUNET_NO to start downloading.
  * @param download_directly #GNUNET_YES to make SaveAs dialog initiate the download,
@@ -774,9 +843,14 @@ start_download2 (int save_as, int download_directly)
       de->pde = psr->download;
   }
   /* else pde remains zero */
+  setup_download_list_entry (de, de->pde, sr);
 
   de->uri = GNUNET_FS_uri_dup (uri);
-  GNUNET_asprintf (&de->filename, "%s%s%s", downloaddir, DIR_SEPARATOR_STR, filename);
+  GNUNET_asprintf (&de->filename,
+                   "%s%s%s",
+                   downloaddir,
+                   DIR_SEPARATOR_STR,
+                   filename);
   de->sr = sr;
   sr->download = de;
   if (GNUNET_GTK_get_selected_anonymity_combo_level (mctx->download_anonymity_combo, &anonymity))
@@ -798,7 +872,9 @@ start_download2 (int save_as, int download_directly)
 
   if (!save_as)
   {
-    if (GNUNET_GTK_tree_model_get_next_flat_iter (model, &iter, !recursive, &next_item))
+    if (GNUNET_GTK_tree_model_get_next_flat_iter (model, &iter,
+                                                  ! recursive,
+                                                  &next_item))
       gtk_tree_selection_select_iter (sel, &next_item);
     GNUNET_FS_GTK_search_treeview_cursor_changed (tv, st);
   }
@@ -942,6 +1018,21 @@ download_as_ctx_menu (GtkMenuItem *item, gpointer user_data)
 
 
 /**
+ * Selected row has changed in downloads tree view, update preview
+ * and metadata areas.
+ *
+ * @param tv the tree view in a search tab where the selection changed
+ * @param user_data unused
+ */
+void
+GNUNET_FS_GTK_download_frame_treeview_cursor_changed_cb (GtkTreeView *tv,
+                                                         gpointer user_data)
+{
+  GNUNET_FS_GTK_search_treeview_cursor_changed (tv, NULL);
+}
+
+
+/**
  * Download "abort" was selected in the current search context menu.
  *
  * @param item the 'abort' menu item
@@ -954,10 +1045,18 @@ abort_download_ctx_menu (GtkMenuItem *item, gpointer user_data)
   struct DownloadEntry *de = spc->sr->download;
   GtkTreeView *tv;
 
-  GNUNET_assert (de->dc != NULL);
+  GNUNET_assert (NULL != de->dc);
   GNUNET_FS_download_stop (de->dc, GNUNET_YES);
-  tv = GTK_TREE_VIEW (gtk_builder_get_object (spc->tab->builder, "_search_result_frame"));
-  GNUNET_FS_GTK_search_treeview_cursor_changed (tv, spc->tab);
+  if (NULL != spc->tab)
+  {
+    tv = GTK_TREE_VIEW (gtk_builder_get_object (spc->tab->builder, "_search_result_frame"));
+    GNUNET_FS_GTK_search_treeview_cursor_changed (tv, spc->tab);
+  }
+  else
+  {
+    tv = GTK_TREE_VIEW (GNUNET_FS_GTK_get_main_window_object ("GNUNET_GTK_download_frame"));
+    GNUNET_FS_GTK_download_frame_treeview_cursor_changed_cb (tv, NULL);
+  }
 }
 
 
@@ -980,9 +1079,12 @@ copy_search_uri_to_clipboard_ctx_menu (GtkMenuItem *item, gpointer user_data)
   GtkClipboard *cb;
 
   path = gtk_tree_row_reference_get_path (spc->rr);
-  tv = GTK_TREE_VIEW (gtk_builder_get_object
-                      (spc->tab->builder,
-                       "_search_result_frame"));
+  if (NULL != spc->tab)
+    tv = GTK_TREE_VIEW (gtk_builder_get_object
+                        (spc->tab->builder,
+                         "_search_result_frame"));
+  else
+    tv = GTK_TREE_VIEW (GNUNET_FS_GTK_get_main_window_object ("GNUNET_GTK_download_frame"));
   tm = gtk_tree_view_get_model (tv);
   if (! gtk_tree_model_get_iter (tm, &iter, path))
   {
@@ -1179,7 +1281,7 @@ populate_popup_with_uri_items (void *cls,
  * an appropriate menu.
  *
  * @param tm tree model underlying the tree view where the event happened
- * @param tab tab where the event happened
+ * @param tab tab where the event happened, NULL for download tab
  * @param init_button which button triggered the popup, or 0 for none
  * @param event_time at what time was the popup triggered
  * @param iter location in the tree model selected at the time
@@ -1369,6 +1471,46 @@ GNUNET_FS_GTK_search_treeview_button_press_event (GtkWidget * widget,
 
 
 /**
+ * We got a right-click on the downloads list. Display the context
+ * menu.
+ *
+ * @param widget the GtkTreeView with the search result list
+ * @param event the event, we only care about button events
+ * @param user_data UNUSED
+ * @return FALSE to propagate the event further,
+ *         TRUE to stop the propagation
+ */
+gboolean
+GNUNET_GTK_download_frame_button_press_event_cb (GtkWidget * widget,
+                                                 GdkEvent * event,
+                                                 gpointer user_data)
+{
+  GtkTreeView *tv = GTK_TREE_VIEW (widget);
+  GdkEventButton *event_button = (GdkEventButton *) event;
+  GtkTreeModel *tm;
+  GtkTreePath *path;
+  GtkTreeIter iter;
+
+  if ( (GDK_BUTTON_PRESS != event->type) ||
+       (3 != event_button->button) )
+    return FALSE; /* not a right-click */
+  if (! gtk_tree_view_get_path_at_pos (tv,
+                                       event_button->x, event_button->y,
+                                       &path, NULL, NULL, NULL))
+    return FALSE; /* click outside of area with values, ignore */
+  tm = gtk_tree_view_get_model (tv);
+  if (! gtk_tree_model_get_iter (tm, &iter, path))
+    return FALSE; /* not sure how we got a path but no iter... */
+  gtk_tree_path_free (path);
+  search_list_popup (tm, NULL,
+                     event_button->button,
+                     event_button->time,
+                     &iter);
+  return FALSE;
+}
+
+
+/**
  * Recalculate and update the label for a search, as we have
  * received additional search results.
  *
@@ -1464,223 +1606,21 @@ GNUNET_FS_GTK_close_uri_tab_ ()
 
 
 /**
- * Copy all of the children of @a src_iter from the @a src_model to
- * become children of @a dst_iter in the @a dst_model.  The models are
- * both 'GNUNET_GTK_file_sharing_result_tree_store' models.
- *
- * Note that we also need to update the `struct SearchResult`
- * and (if it exists) the respective `struct DownloadEntry`
- * to refer to the new model.
- *
- * @param src_model source model
- * @param src_iter parent of the nodes to move
- * @param dst_tab destination tab
- * @param dst_iter new parent of the entries we are moving
- */
-static void
-copy_children (GtkTreeModel * src_model, GtkTreeIter * src_iter,
-               struct SearchTab *dst_tab,
-               GtkTreeIter * dst_iter)
-{
-  GtkTreeIter src_child;
-  GtkTreeIter dst_child;
-  GtkTreePath *path;
-  struct GNUNET_CONTAINER_MetaData *meta;
-  struct GNUNET_FS_Uri *uri;
-  guint64 filesize, completed;
-  GdkPixbuf *preview;
-  guint percent_progress;
-  guint percent_availability;
-  gint unknown_availability;
-  gchar *filename;
-  gchar *uri_as_string;
-  gchar *status_colour;
-  struct SearchResult *search_result_old;
-  struct SearchResult *search_result_new;
-  gchar *mimetype;
-  guint applicability_rank;
-  guint availability_certainty;
-  gint availability_rank;
-  gchar *downloaded_filename;
-  gint downloaded_anonymity;
-  gboolean show_ns_association;
-
-  if (! gtk_tree_model_iter_children (src_model, &src_child, src_iter))
-    return;
-  do
-  {
-    gtk_tree_model_get (src_model, &src_child,
-                        SEARCH_TAB_MC_METADATA, &meta,
-                        SEARCH_TAB_MC_URI, &uri,
-                        SEARCH_TAB_MC_FILESIZE, &filesize,
-                        SEARCH_TAB_MC_PREVIEW, &preview,
-                        SEARCH_TAB_MC_PERCENT_PROGRESS, &percent_progress,
-                        SEARCH_TAB_MC_PERCENT_AVAILABILITY, &percent_availability,
-                        SEARCH_TAB_MC_UNKNOWN_AVAILABILITY, &unknown_availability,
-                        SEARCH_TAB_MC_FILENAME, &filename,
-                        SEARCH_TAB_MC_URI_AS_STRING, &uri_as_string,
-                        SEARCH_TAB_MC_STATUS_COLOUR, &status_colour,
-                        SEARCH_TAB_MC_SEARCH_RESULT, &search_result_old,
-                        SEARCH_TAB_MC_MIMETYPE, &mimetype,
-                        SEARCH_TAB_MC_APPLICABILITY_RANK, &applicability_rank,
-                        SEARCH_TAB_MC_AVAILABILITY_CERTAINTY, &availability_certainty,
-                        SEARCH_TAB_MC_AVAILABILITY_RANK, &availability_rank,
-                        SEARCH_TAB_MC_COMPLETED, &completed,
-                        SEARCH_TAB_MC_DOWNLOADED_FILENAME, &downloaded_filename,
-                        SEARCH_TAB_MC_DOWNLOADED_ANONYMITY, &downloaded_anonymity,
-                        SEARCH_TAB_MC_SHOW_NS_ASSOCIATION, &show_ns_association,
-                        -1);
-    search_result_new = GNUNET_new (struct SearchResult);
-    search_result_new->tab = dst_tab;
-    search_result_new->probe = search_result_old->probe;
-    search_result_old->probe = NULL;
-    search_result_new->download = search_result_old->download;
-    if (NULL != search_result_old->download)
-    {
-      search_result_old->download = NULL;
-      search_result_new->download->sr = search_result_new;
-    }
-    gtk_tree_store_insert_with_values (dst_tab->ts, &dst_child,
-                                       dst_iter, G_MAXINT,
-                                       SEARCH_TAB_MC_METADATA, GNUNET_CONTAINER_meta_data_duplicate (meta),
-                                       SEARCH_TAB_MC_URI, GNUNET_FS_uri_dup (uri),
-                                       SEARCH_TAB_MC_FILESIZE, filesize,
-                                       SEARCH_TAB_MC_PREVIEW, preview,
-                                       SEARCH_TAB_MC_PERCENT_PROGRESS, percent_progress,
-                                       SEARCH_TAB_MC_PERCENT_AVAILABILITY, percent_availability,
-                                       SEARCH_TAB_MC_UNKNOWN_AVAILABILITY, unknown_availability,
-                                       SEARCH_TAB_MC_FILENAME, filename,
-                                       SEARCH_TAB_MC_URI_AS_STRING, uri_as_string,
-                                       SEARCH_TAB_MC_STATUS_COLOUR, status_colour,
-                                       SEARCH_TAB_MC_SEARCH_RESULT, search_result_new,
-                                       SEARCH_TAB_MC_MIMETYPE, mimetype,
-                                       SEARCH_TAB_MC_APPLICABILITY_RANK, applicability_rank,
-                                       SEARCH_TAB_MC_AVAILABILITY_CERTAINTY, availability_certainty,
-                                       SEARCH_TAB_MC_AVAILABILITY_RANK, availability_rank,
-                                       SEARCH_TAB_MC_COMPLETED, completed,
-                                       SEARCH_TAB_MC_DOWNLOADED_FILENAME, downloaded_filename,
-                                       SEARCH_TAB_MC_DOWNLOADED_ANONYMITY, downloaded_anonymity,
-                                       SEARCH_TAB_MC_SHOW_NS_ASSOCIATION, show_ns_association,
-                                       -1);
-    g_free (filename);
-    g_free (downloaded_filename);
-    g_free (uri_as_string);
-    g_free (status_colour);
-    g_free (mimetype);
-    if (preview != NULL)
-      g_object_unref (preview);
-
-    path = gtk_tree_model_get_path (GTK_TREE_MODEL (dst_tab->ts), &dst_child);
-    search_result_new->rr = gtk_tree_row_reference_new (GTK_TREE_MODEL (dst_tab->ts), path);
-    gtk_tree_path_free (path);
-
-    copy_children (src_model, &src_child, dst_tab, &dst_child);
-  }
-  while (gtk_tree_model_iter_next (src_model, &src_child));
-}
-
-
-/**
  * Handle the case where an active download lost its
- * search parent by moving it to the URI tab.
+ * search parent; need to remember that the respective
+ * tab and row reference no longer exist.
  *
  * @param de download where the parent (i.e. search) was lost
  */
 static void
 download_lost_parent (struct DownloadEntry *de)
 {
-  GtkTreeIter iter;
-  GtkTreePath *path;
-  GtkTreeModel *tm_old;
-  GtkTreeIter iter_old;
-  GtkTreeModel *model;
-  struct GNUNET_CONTAINER_MetaData *meta;
-  struct GNUNET_FS_Uri *uri;
-  guint64 completed;
-  guint percent_progress;
-  guint percent_availability;
-  gint unknown_availability;
-  gchar *filename;
-  gchar *status_colour;
-  guint applicability_rank;
-  guint availability_certainty;
-  gint availability_rank;
-  gchar *downloaded_filename;
-  gint downloaded_anonymity;
-  GdkPixbuf *status_animation;
-  gboolean show_ns_association;
-
-  /* find the 'old' root */
-  tm_old = GTK_TREE_MODEL (de->sr->tab->ts);
-  path = gtk_tree_row_reference_get_path (de->sr->rr);
-  if (! gtk_tree_model_get_iter (tm_old, &iter_old, path))
+  de->sr->tab = NULL;
+  if (NULL != de->sr->rr)
   {
-    GNUNET_break (0);
-    gtk_tree_path_free (path);
-    return;
+    gtk_tree_row_reference_free (de->sr->rr);
+    de->sr->rr = NULL;
   }
-  gtk_tree_path_free (path);
-  gtk_tree_model_get (tm_old, &iter_old,
-                      SEARCH_TAB_MC_METADATA, &meta,
-                      SEARCH_TAB_MC_URI, &uri,
-                      SEARCH_TAB_MC_PERCENT_PROGRESS, &percent_progress,
-                      SEARCH_TAB_MC_PERCENT_AVAILABILITY, &percent_availability,
-                      SEARCH_TAB_MC_UNKNOWN_AVAILABILITY, &unknown_availability,
-                      SEARCH_TAB_MC_FILENAME, &filename,
-                      SEARCH_TAB_MC_STATUS_COLOUR, &status_colour,
-                      SEARCH_TAB_MC_APPLICABILITY_RANK, &applicability_rank,
-                      SEARCH_TAB_MC_AVAILABILITY_CERTAINTY, &availability_certainty,
-                      SEARCH_TAB_MC_AVAILABILITY_RANK, &availability_rank,
-                      SEARCH_TAB_MC_COMPLETED, &completed,
-                      SEARCH_TAB_MC_DOWNLOADED_FILENAME, &downloaded_filename,
-                      SEARCH_TAB_MC_DOWNLOADED_ANONYMITY, &downloaded_anonymity,
-                      SEARCH_TAB_MC_STATUS_ICON, &status_animation,
-                      SEARCH_TAB_MC_SHOW_NS_ASSOCIATION, &show_ns_association,
-                      -1);
-  GNUNET_assert (GNUNET_YES == GNUNET_FS_uri_test_equal (uri, de->uri));
-  GNUNET_assert (de->sr->download == de);
-  de->sr->download = NULL;
-
-  /* create the target root */
-  de->sr = GNUNET_GTK_add_to_uri_tab (downloaded_anonymity,
-                                      meta, uri);
-  de->sr->download = de;
-
-  /* get positions of the 'new' root */
-  model = GTK_TREE_MODEL (de->sr->tab->ts);
-  path = gtk_tree_row_reference_get_path (de->sr->rr);
-  if (! gtk_tree_model_get_iter (model, &iter, path))
-  {
-    GNUNET_break (0);
-    gtk_tree_path_free (path);
-    g_free (filename);
-    g_free (downloaded_filename);
-    g_free (status_colour);
-    return;
-  }
-  gtk_tree_path_free (path);
-
-  gtk_tree_store_set (de->sr->tab->ts, &iter,
-                      SEARCH_TAB_MC_PERCENT_PROGRESS, percent_progress,
-                      SEARCH_TAB_MC_PERCENT_AVAILABILITY, percent_availability,
-                      SEARCH_TAB_MC_UNKNOWN_AVAILABILITY, unknown_availability,
-                      SEARCH_TAB_MC_FILENAME, filename,
-                      SEARCH_TAB_MC_STATUS_COLOUR, status_colour,
-                      SEARCH_TAB_MC_APPLICABILITY_RANK, applicability_rank,
-                      SEARCH_TAB_MC_AVAILABILITY_CERTAINTY, availability_certainty,
-                      SEARCH_TAB_MC_AVAILABILITY_RANK, availability_rank,
-                      SEARCH_TAB_MC_COMPLETED, completed,
-                      SEARCH_TAB_MC_DOWNLOADED_FILENAME, downloaded_filename,
-                      SEARCH_TAB_MC_DOWNLOADED_ANONYMITY, downloaded_anonymity,
-                      SEARCH_TAB_MC_STATUS_ICON, status_animation,
-                      SEARCH_TAB_MC_SHOW_NS_ASSOCIATION, show_ns_association,
-                      -1);
-  g_free (filename);
-  g_free (downloaded_filename);
-  g_free (status_colour);
-
-  /* finally, move all children over as well */
-  copy_children (tm_old, &iter_old, de->sr->tab, &iter);
 }
 
 
@@ -1707,25 +1647,16 @@ move_downloads_in_subtree (GtkTreeModel *tm,
   {
     do
     {
+      if (NULL != sr->download)
+      {
+        download_lost_parent (sr->download);
+        continue;
+      }
       gtk_tree_model_get (tm, &child,
                           SEARCH_TAB_MC_METADATA, &meta,
                           SEARCH_TAB_MC_URI, &uri,
                           SEARCH_TAB_MC_SEARCH_RESULT, &sr,
                           -1);
-      if (NULL != sr->download)
-      {
-        if (sr->download->is_done == GNUNET_YES)
-        {
-          /* got a finished download, stop it */
-          GNUNET_FS_download_stop (sr->download->dc, GNUNET_YES);
-        }
-        else
-        {
-          /* got an active download, move to URI tab! */
-          download_lost_parent (sr->download);
-        }
-      }
-      GNUNET_assert (NULL == sr->download);
       move_downloads_in_subtree (tm, &child);
       GNUNET_FS_uri_destroy (uri);
       if (NULL != meta)
@@ -1747,7 +1678,7 @@ move_downloads_in_subtree (GtkTreeModel *tm,
                           SEARCH_TAB_MC_SEARCH_RESULT, NULL,
                           -1);
     }
-    while (TRUE == gtk_tree_model_iter_next (tm, &child));
+    while (gtk_tree_model_iter_next (tm, &child));
   }
 }
 
@@ -1791,11 +1722,15 @@ free_search_result (struct SearchResult *sr)
                       SEARCH_TAB_MC_METADATA, &meta,
                       SEARCH_TAB_MC_URI, &uri,
                       -1);
-  if (uri != NULL)
+  if (NULL != uri)
     GNUNET_FS_uri_destroy (uri);
-  if (meta != NULL)
+  if (NULL != meta)
     GNUNET_CONTAINER_meta_data_destroy (meta);
-  gtk_tree_row_reference_free (sr->rr);
+  if (NULL != sr->rr)
+  {
+    gtk_tree_row_reference_free (sr->rr);
+    sr->rr = NULL;
+  }
   if (NULL != sr->probe)
   {
     GNUNET_FS_probe_stop (sr->probe);
@@ -1815,13 +1750,12 @@ free_search_result (struct SearchResult *sr)
  * and metadata areas.
  *
  * @param tv the tree view in a search tab where the selection changed
- * @param user_data the 'struct SearchTab' that contains the tree view
+ * @param user_data unused
  */
 void
 GNUNET_FS_GTK_search_treeview_cursor_changed (GtkTreeView *tv,
                                               gpointer user_data)
 {
-  struct SearchTab *tab = user_data;
   GtkTreeSelection *sel;
   GtkTreeModel *model;
   GtkTreeIter iter;
@@ -1832,7 +1766,6 @@ GNUNET_FS_GTK_search_treeview_cursor_changed (GtkTreeView *tv,
   struct GNUNET_FS_Uri *uri;
   struct GNUNET_GTK_MainWindowContext *mctx = GNUNET_FS_GTK_get_main_context ();
 
-  GNUNET_assert (tab->query_txt != NULL);
   gtk_list_store_clear (mctx->md_liststore);
   sel = gtk_tree_view_get_selection (tv);
   if (! gtk_tree_selection_get_selected (sel, &model, &iter))
@@ -1948,7 +1881,7 @@ GNUNET_GTK_main_window_notebook_switch_page_cb (GtkWidget * dummy,
      clear meta data and preview widgets */
   gtk_image_clear (mctx->preview_image);
   gtk_list_store_clear (mctx->md_liststore);
-  if (current_selected_search_result != NULL)
+  if (NULL != current_selected_search_result)
     gtk_tree_path_free (current_selected_search_result);
   current_selected_search_result = NULL;
 }
@@ -2047,7 +1980,7 @@ stop_downloads_in_subtree (GtkTreeModel *tm,
                           SEARCH_TAB_MC_SEARCH_RESULT, &sr,
                           -1);
       if ( (NULL != sr->download) &&
-           (sr->download->is_done == GNUNET_YES) )
+           (GNUNET_YES == sr->download->is_done) )
       {
         /* got a finished download, stop it */
         GNUNET_FS_download_stop (sr->download->dc, GNUNET_YES);
@@ -2058,32 +1991,30 @@ stop_downloads_in_subtree (GtkTreeModel *tm,
       if (GNUNET_YES != stop_downloads_in_subtree (tm, &child))
         ret = GNUNET_NO;
     }
-    while (TRUE == gtk_tree_model_iter_next (tm, &child));
+    while (gtk_tree_model_iter_next (tm, &child));
   }
   return ret;
 }
 
 
 /**
- * User clicked on the 'clean' button of a search tab.
+ * User clicked on the 'clean' button of the downloads tab.
  * Stop completed downloads (or those that failed).  Should
  * iterate over the underlying tree store and stop all
- * completed entries.  Furthermore, if the resulting tree
- * store is empty and has no search associated with it,
- * the tab should be closed.
+ * completed entries.
  *
  * @param button the button pressed by the user
- * @param user_data the `struct SearchTab` of the respective tab to clean up
+ * @param user_data
  */
 void
-GNUNET_FS_GTK_search_result_clear_button_clicked (GtkButton * button, gpointer user_data)
+GNUNET_FS_GTK_downloads_clear_button_clicked (GtkButton * button,
+                                              gpointer user_data)
 {
-  struct SearchTab *tab = user_data;
   struct SearchResult *sr;
   GtkTreeModel *tm;
   GtkTreeIter iter;
 
-  tm = GTK_TREE_MODEL (tab->ts);
+  tm = GTK_TREE_MODEL (downloads_treestore);
   if (! gtk_tree_model_get_iter_first (tm, &iter))
     return;
   do
@@ -2091,11 +2022,13 @@ GNUNET_FS_GTK_search_result_clear_button_clicked (GtkButton * button, gpointer u
     gtk_tree_model_get (tm, &iter,
                         SEARCH_TAB_MC_SEARCH_RESULT, &sr,
                         -1);
-    if ( (sr->download != NULL) &&
-         (sr->download->is_done == GNUNET_YES) )
+    if ( (NULL != sr->download) &&
+         (GNUNET_YES == sr->download->is_done) )
     {
       /* got a finished download, stop it */
       GNUNET_FS_download_stop (sr->download->dc, GNUNET_YES);
+      if (! gtk_tree_model_get_iter_first (tm, &iter))
+        return;
     }
     if ( (NULL == sr->download) &&
          (NULL == sr->result) &&
@@ -2216,7 +2149,23 @@ update_search_result (struct SearchResult *sr,
                       SEARCH_TAB_MC_AVAILABILITY_CERTAINTY, (guint) availability_certainty,
                       SEARCH_TAB_MC_AVAILABILITY_RANK, (gint) availability_rank,
                       -1);
-  if (pixbuf != NULL)
+  if (NULL != sr->download)
+  {
+    get_download_list_entry (sr->download, &iter);
+    gtk_tree_store_set (downloads_treestore, &iter,
+                        SEARCH_TAB_MC_METADATA, GNUNET_CONTAINER_meta_data_duplicate (meta),
+                        SEARCH_TAB_MC_PREVIEW, pixbuf,
+                        SEARCH_TAB_MC_PERCENT_AVAILABILITY, (guint) percent_avail,
+                        SEARCH_TAB_MC_UNKNOWN_AVAILABILITY, (0 == availability_certainty) ? (gint) (probe_time.rel_value_us / GNUNET_FS_PROBE_UPDATE_FREQUENCY.rel_value_us) : -1,
+                        SEARCH_TAB_MC_FILENAME, desc,
+                        SEARCH_TAB_MC_MIMETYPE, mime,
+                        SEARCH_TAB_MC_APPLICABILITY_RANK, (guint) applicability_rank,
+                        SEARCH_TAB_MC_AVAILABILITY_CERTAINTY, (guint) availability_certainty,
+                        SEARCH_TAB_MC_AVAILABILITY_RANK, (gint) availability_rank,
+                        -1);
+  }
+
+  if (NULL != pixbuf)
     g_object_unref (pixbuf);
   GNUNET_free (desc);
   GNUNET_free_non_null (mime);
@@ -2264,7 +2213,7 @@ see_if_there_are_any_uris (void *cls,
  * not only for 'normal' search results but also for directories that
  * are being opened and if the user manually enters a URI.
  *
- * @param tab search tab to extend, never NULL
+ * @param tab search tab to extend, NULL if we are only in the download tab
  * @param anonymity anonymity level to use for probes for this result
  * @param parent_rr reference to parent entry in search tab, NULL for normal
  *                  search results,
@@ -2375,7 +2324,10 @@ GNUNET_GTK_add_search_result (struct SearchTab *tab,
   {
     /* top-level result */
     pitr = NULL;
-    ts = tab->ts;
+    if (NULL != tab)
+      ts = tab->ts;
+    else
+      ts = downloads_treestore;
   }
   gtk_tree_store_insert_with_values (ts, &iter, pitr, G_MAXINT,
                                      SEARCH_TAB_MC_METADATA, GNUNET_CONTAINER_meta_data_duplicate (meta),
@@ -2411,10 +2363,12 @@ GNUNET_GTK_add_search_result (struct SearchTab *tab,
 
   /* move up to the outermost tab, in case this is an 'inner'
      search (namespace update case) */
-  while (NULL != tab->parent)
-    tab = tab->parent->tab;
-  tab->num_results++;
-
+  if (NULL != tab)
+  {
+    while (NULL != tab->parent)
+      tab = tab->parent->tab;
+    tab->num_results++;
+  }
   return sr;
 }
 
@@ -2736,17 +2690,22 @@ change_download_color (struct DownloadEntry *de,
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Changing download DE=%p color to %s\n",
               de, color);
-  path = gtk_tree_row_reference_get_path (de->sr->rr);
-  if (! gtk_tree_model_get_iter (GTK_TREE_MODEL (de->sr->tab->ts), &iter, path))
+  if (NULL != de->sr->tab)
   {
-    GNUNET_break (0);
+    path = gtk_tree_row_reference_get_path (de->sr->rr);
+    GNUNET_assert (gtk_tree_model_get_iter (GTK_TREE_MODEL (de->sr->tab->ts),
+                                            &iter, path));
     gtk_tree_path_free (path);
-    return;
+    gtk_tree_store_set (de->sr->tab->ts, &iter,
+                        SEARCH_TAB_MC_STATUS_COLOUR, color,
+                        -1);
   }
-  gtk_tree_path_free (path);
-  gtk_tree_store_set (de->sr->tab->ts, &iter,
+  /* do the same update to the downloads tree store */
+  get_download_list_entry (de, &iter);
+  gtk_tree_store_set (downloads_treestore, &iter,
                       SEARCH_TAB_MC_STATUS_COLOUR, color,
                       -1);
+
 }
 
 
@@ -2763,15 +2722,18 @@ change_download_status_icon (struct DownloadEntry *de,
   GtkTreeIter iter;
   GtkTreePath *path;
 
-  path = gtk_tree_row_reference_get_path (de->sr->rr);
-  if (! gtk_tree_model_get_iter (GTK_TREE_MODEL (de->sr->tab->ts), &iter, path))
+  if (NULL != de->sr->tab)
   {
-    GNUNET_break (0);
+    path = gtk_tree_row_reference_get_path (de->sr->rr);
+    GNUNET_assert (gtk_tree_model_get_iter (GTK_TREE_MODEL (de->sr->tab->ts), &iter, path));
     gtk_tree_path_free (path);
-    return;
+    gtk_tree_store_set (de->sr->tab->ts, &iter,
+                        SEARCH_TAB_MC_STATUS_ICON, icon,
+                        -1);
   }
-  gtk_tree_path_free (path);
-  gtk_tree_store_set (de->sr->tab->ts, &iter,
+  /* do the same update to the downloads tree store */
+  get_download_list_entry (de, &iter);
+  gtk_tree_store_set (downloads_treestore, &iter,
                       SEARCH_TAB_MC_STATUS_ICON, icon,
                       -1);
 }
@@ -2927,25 +2889,30 @@ mark_download_progress (struct DownloadEntry *de,
                         unsigned int depth)
 {
   GtkTreeIter iter;
+  GtkTreeIter diter;
   GtkTreePath *path;
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Marking download progress for DE=%p, %llu/%llu, %llu@%llu depth=%u\n",
               de, completed, size, block_size, offset, depth);
 
-  path = gtk_tree_row_reference_get_path (de->sr->rr);
-  if (! gtk_tree_model_get_iter (GTK_TREE_MODEL (de->sr->tab->ts), &iter, path))
+  if (NULL != de->sr->tab)
   {
-    GNUNET_break (0);
+    path = gtk_tree_row_reference_get_path (de->sr->rr);
+    GNUNET_assert (gtk_tree_model_get_iter (GTK_TREE_MODEL (de->sr->tab->ts),
+                                            &iter, path));
     gtk_tree_path_free (path);
-    return;
+    /* FIXME-DESIGN: should we replace the 'availability' with
+       'progress' once the download has started and re-use the
+       space in the display? Probably yes, at least once we have
+       a custom CellRenderer... */
+    gtk_tree_store_set (de->sr->tab->ts, &iter,
+                        SEARCH_TAB_MC_PERCENT_PROGRESS, (guint) ((size > 0) ?  (100 * completed / size) : 100),
+                        SEARCH_TAB_MC_COMPLETED, completed,
+                        -1);
   }
-  gtk_tree_path_free (path);
-  /* FIXME-DESIGN: should we replace the 'availability' with
-     'progress' once the download has started and re-use the
-     space in the display? Probably yes, at least once we have
-     a custom CellRenderer... */
-  gtk_tree_store_set (de->sr->tab->ts, &iter,
+  get_download_list_entry (de, &diter);
+  gtk_tree_store_set (downloads_treestore, &diter,
                       SEARCH_TAB_MC_PERCENT_PROGRESS, (guint) ((size > 0) ?  (100 * completed / size) : 100),
                       SEARCH_TAB_MC_COMPLETED, completed,
                       -1);
@@ -2969,7 +2936,11 @@ mark_download_progress (struct DownloadEntry *de,
       {
         /* Mime type was wrong, this is not a directory, update model! */
         de->is_directory = GNUNET_SYSERR;
-        gtk_tree_store_set (de->sr->tab->ts, &iter,
+        if (NULL != de->sr->tab)
+          gtk_tree_store_set (de->sr->tab->ts, &iter,
+                              SEARCH_TAB_MC_MIMETYPE, "",
+                              -1);
+        gtk_tree_store_set (downloads_treestore, &diter,
                             SEARCH_TAB_MC_MIMETYPE, "",
                             -1);
       }
@@ -3012,20 +2983,24 @@ mark_download_error (struct DownloadEntry *de,
 
   change_download_color (de, "red");
   de->is_done = GNUNET_YES;
-  path = gtk_tree_row_reference_get_path (de->sr->rr);
-  if (! gtk_tree_model_get_iter (GTK_TREE_MODEL (de->sr->tab->ts), &iter, path))
+  if (NULL == animation_error)
+    animation_error = load_animation ("error");
+  if (NULL != de->sr->tab)
   {
-    GNUNET_break (0);
+    path = gtk_tree_row_reference_get_path (de->sr->rr);
+    GNUNET_assert (gtk_tree_model_get_iter (GTK_TREE_MODEL (de->sr->tab->ts), &iter, path));
     gtk_tree_path_free (path);
-    return;
+    gtk_tree_store_set (de->sr->tab->ts, &iter,
+                        SEARCH_TAB_MC_PERCENT_PROGRESS, (guint) 0,
+                        SEARCH_TAB_MC_URI_AS_STRING, emsg,
+                        SEARCH_TAB_MC_STATUS_ICON,  GNUNET_GTK_animation_context_get_pixbuf (animation_error),
+                        -1);
   }
-  gtk_tree_path_free (path);
-  if (NULL == animation_error)
-    animation_error = load_animation ("error");
-  gtk_tree_store_set (de->sr->tab->ts, &iter,
+  get_download_list_entry (de, &iter);
+  gtk_tree_store_set (downloads_treestore, &iter,
                       SEARCH_TAB_MC_PERCENT_PROGRESS, (guint) 0,
                       SEARCH_TAB_MC_URI_AS_STRING, emsg,
-                      SEARCH_TAB_MC_STATUS_ICON,  GNUNET_GTK_animation_context_get_pixbuf (animation_error),
+                      SEARCH_TAB_MC_STATUS_ICON, GNUNET_GTK_animation_context_get_pixbuf (animation_error),
                       -1);
 }
 
@@ -3045,15 +3020,21 @@ mark_download_completed (struct DownloadEntry *de, uint64_t size)
 
   de->is_done = GNUNET_YES;
   change_download_color (de, "green");
-  path = gtk_tree_row_reference_get_path (de->sr->rr);
-  if (! gtk_tree_model_get_iter (GTK_TREE_MODEL (de->sr->tab->ts), &iter, path))
+  if (NULL != de->sr->tab)
   {
-    GNUNET_break (0);
+    path = gtk_tree_row_reference_get_path (de->sr->rr);
+    GNUNET_assert (gtk_tree_model_get_iter (GTK_TREE_MODEL (de->sr->tab->ts),
+                                            &iter, path));
     gtk_tree_path_free (path);
-    return;
+    gtk_tree_store_set (de->sr->tab->ts, &iter,
+                        SEARCH_TAB_MC_PERCENT_PROGRESS, (guint) 100,
+                        SEARCH_TAB_MC_PERCENT_AVAILABILITY, (guint) 100,
+                        SEARCH_TAB_MC_UNKNOWN_AVAILABILITY, -1,
+                        SEARCH_TAB_MC_STATUS_ICON, GNUNET_GTK_animation_context_get_pixbuf (animation_downloaded),
+                        -1);
   }
-  gtk_tree_path_free (path);
-  gtk_tree_store_set (de->sr->tab->ts, &iter,
+  get_download_list_entry (de, &iter);
+  gtk_tree_store_set (downloads_treestore, &iter,
                       SEARCH_TAB_MC_PERCENT_PROGRESS, (guint) 100,
                       SEARCH_TAB_MC_PERCENT_AVAILABILITY, (guint) 100,
                       SEARCH_TAB_MC_UNKNOWN_AVAILABILITY, -1,
@@ -3075,10 +3056,11 @@ mark_download_completed (struct DownloadEntry *de, uint64_t size)
  * @param meta metadata
  * @param size total size
  * @param completed current progress
- * @return download entry struct for the download (equal to 'de' if 'de' was not NULL)
+ * @return download entry struct for the download (equal to @a de if @a de was not NULL)
  */
 static struct DownloadEntry *
-setup_download (struct DownloadEntry *de, struct DownloadEntry *pde,
+setup_download (struct DownloadEntry *de,
+                struct DownloadEntry *pde,
                 struct SearchResult *sr,
                 uint32_t anonymity,
                 struct GNUNET_FS_DownloadContext *dc,
@@ -3088,6 +3070,7 @@ setup_download (struct DownloadEntry *de, struct DownloadEntry *pde,
 {
   GtkTreeIter iter;
   GtkTreePath *path;
+  GtkTreeModel *tm;
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Setting up download, initially DE=%p, PDE=%p for %p & %p into %llu/%llu `%s'\n",
@@ -3120,7 +3103,8 @@ setup_download (struct DownloadEntry *de, struct DownloadEntry *pde,
     }
   }
   if ( (NULL == de->sr) &&
-       (NULL != pde) )
+       (NULL != pde) &&
+       (NULL != pde->sr->tab) )
   {
     /* child download, find appropriate search result from parent! */
     GtkTreePath *path;
@@ -3166,9 +3150,13 @@ setup_download (struct DownloadEntry *de, struct DownloadEntry *pde,
   {
     /* Stand-alone download with no 'row'/search result affiliated
        with the download so far; create a fresh entry for this
-       download in the URI tab */
-    de->sr = GNUNET_GTK_add_to_uri_tab (anonymity,
-                                        meta, uri);
+       download */
+    de->sr = GNUNET_GTK_add_search_result (NULL,
+                                           anonymity,
+                                           NULL,
+                                           uri,
+                                           meta,
+                                           NULL, 0);
     GNUNET_FS_probe_stop (de->sr->probe);
     de->sr->probe = NULL;
     GNUNET_CONTAINER_DLL_remove (pl_head,
@@ -3176,7 +3164,9 @@ setup_download (struct DownloadEntry *de, struct DownloadEntry *pde,
                                  de->sr);
     de->sr->download = de;
     path = gtk_tree_row_reference_get_path (de->sr->rr);
-    if (! gtk_tree_model_get_iter (GTK_TREE_MODEL (de->sr->tab->ts), &iter, path))
+    tm = gtk_tree_row_reference_get_model (de->sr->rr);
+    if (! gtk_tree_model_get_iter (tm,
+                                   &iter, path))
     {
       GNUNET_break (0);
       gtk_tree_path_free (path);
@@ -3189,19 +3179,34 @@ setup_download (struct DownloadEntry *de, struct DownloadEntry *pde,
 
    /* get metadata from existing tab, might have a mime type */
     path = gtk_tree_row_reference_get_path (de->sr->rr);
-    if (! gtk_tree_model_get_iter (GTK_TREE_MODEL (de->sr->tab->ts), &iter, path))
+    tm = gtk_tree_row_reference_get_model (de->sr->rr);
+    if (! gtk_tree_model_get_iter (tm, &iter, path))
     {
       GNUNET_break (0);
       gtk_tree_path_free (path);
       return de;
     }
-    gtk_tree_model_get (GTK_TREE_MODEL (de->sr->tab->ts), &iter,
+    gtk_tree_model_get (tm, &iter,
                         SEARCH_TAB_MC_METADATA, &meta,
                         -1);
     de->is_directory = GNUNET_FS_meta_data_test_for_directory (meta);
   }
+  if (NULL == de->rr)
+    setup_download_list_entry (de, pde, de->sr);
   gtk_tree_path_free (path);
-  gtk_tree_store_set (de->sr->tab->ts, &iter,
+  gtk_tree_store_set (GTK_TREE_STORE (tm), &iter,
+                      SEARCH_TAB_MC_PERCENT_PROGRESS, (guint) ((size > 0) ? (100 * completed / size) : 100),
+                      SEARCH_TAB_MC_FILENAME, filename,
+                      SEARCH_TAB_MC_STATUS_COLOUR, "blue",
+                      SEARCH_TAB_MC_SEARCH_RESULT, de->sr,
+                      SEARCH_TAB_MC_COMPLETED, (guint64) completed,
+                      SEARCH_TAB_MC_DOWNLOADED_FILENAME, de->filename,
+                      SEARCH_TAB_MC_DOWNLOADED_ANONYMITY, de->anonymity,
+                      SEARCH_TAB_MC_STATUS_ICON, GNUNET_GTK_animation_context_get_pixbuf (animation_download_stalled),
+                      -1);
+  /* also update downloads tab */
+  get_download_list_entry (de, &iter);
+  gtk_tree_store_set (downloads_treestore, &iter,
                       SEARCH_TAB_MC_PERCENT_PROGRESS, (guint) ((size > 0) ? (100 * completed / size) : 100),
                       SEARCH_TAB_MC_FILENAME, filename,
                       SEARCH_TAB_MC_STATUS_COLOUR, "blue",
@@ -3404,7 +3409,7 @@ handle_publish_stop (struct PublishEntry *pe)
   (void) gtk_tree_store_remove (pe->tab->ts, &iter);
   gtk_tree_path_free (path);
   gtk_tree_row_reference_free (pe->rr);
-  if (pe->uri != NULL)
+  if (NULL != pe->uri)
   {
     GNUNET_FS_uri_destroy (pe->uri);
     pe->uri = NULL;
@@ -3572,7 +3577,6 @@ struct PublishListPopupContext
    */
   GtkTreeRowReference *rr;
 
-
   /**
    * Publishing entry at the respective row.
    */