1 files changed, 44 insertions, 7 deletions

diff --git a/src/fs_event_handler.c b/src/fs_event_handler.c
index d1c88d6b..ebadd9d7 100644
--- a/src/fs_event_handler.c
+++ b/src/fs_event_handler.c
@@ -42,6 +42,7 @@ struct SearchTab
   GtkWidget *frame;
   GtkWidget *tab_label;
   GtkWidget *close_button;
+  GtkWidget *clear_button;
   GtkWidget *play_button;
   GtkWidget *pause_button;
   GtkLabel *label;
@@ -226,12 +227,18 @@ download_lost_parent (struct DownloadEntry *de,
                       int is_active)
 {
   GtkTreeIter iter;
+  GtkTreePath *path;
 
   gtk_tree_row_reference_free (de->rr);
   de->sr = NULL;
   de->ts = GNUNET_GTK_add_to_uri_tab (&iter,
                                       de->meta,
                                       de->uri);
+  path = gtk_tree_model_get_path (GTK_TREE_MODEL (de->ts),
+                                  &iter);
+  de->rr = gtk_tree_row_reference_new (GTK_TREE_MODEL (de->ts),
+                                       path);
+  gtk_tree_path_free (path);
   mark_download_progress (de, size, completed);
   if (size > completed)
     {
@@ -489,7 +496,7 @@ update_meta_data_views (GtkTreeView *tv,
   struct GNUNET_CONTAINER_MetaData *meta;
   GdkPixbuf *pixbuf;
 
-  GNUNET_assert (tab->sc != NULL);
+  GNUNET_assert (tab->query_txt != NULL);
   image = GTK_IMAGE (GNUNET_GTK_get_main_window_object ("GNUNET_GTK_main_window_preview_image"));
   ms = GTK_LIST_STORE (GNUNET_GTK_get_main_window_object ("GNUNET_GTK_meta_data_list_store"));
 
@@ -531,12 +538,19 @@ update_search_label (struct SearchTab *tab)
 {
   char *name;
  
-  GNUNET_asprintf (&name,
-                   "%.*s%s (%u)",
-                   20,
-                   tab->query_txt,
-                   strlen (tab->query_txt) > 20 ? "..." : "",
-                   tab->num_results);
+  if (tab->num_results > 0)
+    GNUNET_asprintf (&name,
+                     "%.*s%s (%u)",
+                     20,
+                     tab->query_txt,
+                     strlen (tab->query_txt) > 20 ? "..." : "",
+                     tab->num_results);
+  else
+    GNUNET_asprintf (&name,
+                     "%.*s%s",
+                     20,
+                     tab->query_txt,
+                     strlen (tab->query_txt) > 20 ? "..." : "");
   gtk_label_set_text (tab->label, name);
   GNUNET_free (name);
 }
@@ -623,6 +637,22 @@ stop_search (GtkButton *button,
 
 
 /**
+ * Stop completed downloads (or those that failed).
+ */
+static void
+clear_downloads (GtkButton *button,
+                 gpointer user_data)
+{
+  struct SearchTab *tab = user_data;
+  if (tab->sc != NULL)
+    {
+    }
+  GNUNET_break (0);
+}
+
+
+
+/**
  * Tell FS to pause a search.
  */
 static void
@@ -715,6 +745,10 @@ setup_search (struct GNUNET_FS_SearchContext *sc,
                                                           "_search_result_label_close_button"));
   g_signal_connect(G_OBJECT(tab->close_button), "clicked", 
                    G_CALLBACK(stop_search), tab);
+  tab->clear_button = GTK_WIDGET (gtk_builder_get_object (tab->builder,
+                                                          "_search_result_label_clear_button"));
+  g_signal_connect(G_OBJECT(tab->clear_button), "clicked", 
+                   G_CALLBACK(clear_downloads), tab);
   tab->play_button = GTK_WIDGET (gtk_builder_get_object (tab->builder,
                                                          "_search_result_label_play_button"));
   g_signal_connect(G_OBJECT(tab->play_button), "clicked", 
@@ -885,6 +919,8 @@ GNUNET_GTK_add_to_uri_tab (GtkTreeIter *iter,
   if (utab == NULL)
     {
       utab = setup_search (NULL, NULL);
+      gtk_widget_set_visible (utab->close_button,
+                              FALSE);
     }
   else
     {
@@ -894,6 +930,7 @@ GNUNET_GTK_add_to_uri_tab (GtkTreeIter *iter,
   sr = add_search_result (utab, iter,
                           NULL, uri, meta,
                           NULL, 0);
+  
   return GTK_TREE_STORE (gtk_builder_get_object (utab->builder,
                                                  "GNUNET_GTK_file_sharing_result_tree_store"));
 }