1 files changed, 10 insertions, 154 deletions

diff --git a/src/plugins/fs/search.c b/src/plugins/fs/search.c
index f1d7e325..ab78d844 100644
--- a/src/plugins/fs/search.c
+++ b/src/plugins/fs/search.c
@@ -61,33 +61,14 @@ on_fssearchSelectionChanged (gpointer signal, gpointer cls)
 /* **************** FSUI event handling ****************** */
 
 /**
- * Update the number of results received for the given
- * search in the summary and in the label of the tab.
+ * Update the number of results received in the label of the tab.
  */
 static void
-updateSearchSummary (SearchList * searchContext)
+updateResultsCount (SearchList * searchContext)
 {
-  GtkTreePath *path;
-  GtkTreeIter iter;
   char *new_title;
   GtkLabel *label;
 
-  path =
-    gtk_tree_row_reference_get_path (searchContext->summaryViewRowReference);
-  if (TRUE !=
-      gtk_tree_model_get_iter (GTK_TREE_MODEL (search_summary), &iter, path))
-    {
-      GNUNET_GE_BREAK (ectx, 0);
-      return;
-    }
-  gtk_tree_path_free (path);
-  gtk_list_store_set (search_summary,
-                      &iter,
-                      SEARCH_SUMMARY_RESULT_COUNT,
-                      searchContext->resultsReceived, -1);
-
-
-
   /* update tab title with the number of results */
   new_title =
     g_strdup_printf ("%.*s%s (%u)",
@@ -336,7 +317,7 @@ fs_search_result_received (SearchList * searchContext,
   gtk_tree_store_append (model, &iter, NULL);
   addEntryToSearchTree (searchContext, NULL, info, &iter);
   searchContext->resultsReceived++;
-  updateSearchSummary (searchContext);
+  updateResultsCount (searchContext);
 }
 
 /**
@@ -644,8 +625,7 @@ search_click_handler (void *cls, GdkEvent * event)
 }
 
 /**
- * FSUI event: a search was started; create the
- * tab and add an entry to the summary.
+ * FSUI event: a search was started; create the tab
  */
 SearchList *
 fs_search_started (struct GNUNET_FSUI_SearchList * fsui_list,
@@ -661,8 +641,6 @@ fs_search_started (struct GNUNET_FSUI_SearchList * fsui_list,
   GtkTreeViewColumn *column;
   GtkCellRenderer *renderer;
   GtkNotebook *notebook;
-  GtkTreePath *path;
-  GtkTreeIter iter;
   int col;
   unsigned int i;
 
@@ -680,7 +658,7 @@ fs_search_started (struct GNUNET_FSUI_SearchList * fsui_list,
           for (i = 0; i < resultCount; i++)
             fs_search_result_received (list, &results[i], uri);
           if (resultCount == 0) /* otherwise already done! */
-            updateSearchSummary (list);
+            updateResultsCount (list);
           return list;
         }
       list = list->next;
@@ -888,18 +866,6 @@ fs_search_started (struct GNUNET_FSUI_SearchList * fsui_list,
   gtk_tree_view_column_set_reorderable (column, TRUE);
   gtk_tree_view_column_set_sort_column_id (column, SEARCH_DESC);
 
-  /* add entry in search summary */
-  gtk_list_store_append (search_summary, &iter);
-  gtk_list_store_set (search_summary,
-                      &iter,
-                      SEARCH_SUMMARY_NAME, description,
-                      SEARCH_SUMMARY_RESULT_COUNT, 0,
-                      SEARCH_SUMMARY_INTERNAL, list, -1);
-  path = gtk_tree_model_get_path (GTK_TREE_MODEL (search_summary), &iter);
-  list->summaryViewRowReference
-    = gtk_tree_row_reference_new (GTK_TREE_MODEL (search_summary), path);
-  gtk_tree_path_free (path);
-
   /* load label */
   list->labelXML
     = glade_xml_new (GNUNET_GTK_get_glade_filename (),
@@ -913,7 +879,7 @@ fs_search_started (struct GNUNET_FSUI_SearchList * fsui_list,
   for (i = 0; i < resultCount; i++)
     fs_search_result_received (list, &results[i], uri);
   if (resultCount == 0)         /* otherwise already done! */
-    updateSearchSummary (list);
+    updateResultsCount (list);
 
   /* insert new page into search notebook */
   notebook
@@ -983,17 +949,15 @@ fs_search_restarted (SearchList * list)
 }
 
 /**
- * FSUI event: a search was stopped.  Remove the
- * respective tab and its entry in the summary.
+ * FSUI event: a search was stopped.
+ * Remove the respective tab.
  */
 void
 fs_search_stopped (SearchList * list)
 {
   GtkNotebook *notebook;
-  GtkTreeIter iter;
   SearchList *prev;
   DownloadList *downloads;
-  GtkTreePath *path;
   int index;
   int i;
 
@@ -1034,19 +998,9 @@ fs_search_stopped (SearchList * list)
       index = i;
   GNUNET_GE_BREAK (ectx, index != -1);
   gtk_notebook_remove_page (notebook, index);
-  /* recursively free search model */
-  if (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (list->tree), &iter))
-    freeIterSubtree (GTK_TREE_MODEL (list->tree), &iter);
-
-  /* destroy entry in summary */
-  path = gtk_tree_row_reference_get_path (list->summaryViewRowReference);
-  gtk_tree_model_get_iter (GTK_TREE_MODEL (search_summary), &iter, path);
-  gtk_tree_path_free (path);
-  gtk_list_store_remove (search_summary, &iter);
   /* free list state itself */
   UNREF (list->searchXML);
   UNREF (list->labelXML);
-  gtk_tree_row_reference_free (list->summaryViewRowReference);
   GNUNET_free (list->searchString);
   GNUNET_ECRS_uri_destroy (list->uri);
   GNUNET_free (list);
@@ -1286,7 +1240,7 @@ on_closeSearchButton_clicked_fs (GtkWidget * searchPage,
 
 
 /**
- * The abort button in the search summary was clicked.
+ * The pause button in a search results tab was clicked.
  */
 void
 on_searchPauseButton_clicked_fs (GtkWidget * searchPage,
@@ -1315,7 +1269,7 @@ on_searchPauseButton_clicked_fs (GtkWidget * searchPage,
 }
 
 /**
- * The abort button in the search summary was clicked.
+ * The resume button in a search results tab was clicked.
  */
 void
 on_searchResumeButton_clicked_fs (GtkWidget * searchPage,
@@ -1343,102 +1297,4 @@ on_searchResumeButton_clicked_fs (GtkWidget * searchPage,
     }
 }
 
-/**
- * The abort button was clicked.  Abort the search.
- */
-void
-on_abortSearchButton_clicked_fs (GtkWidget * searchPage,
-                                 GtkWidget * abortButton)
-{
-  SearchList *list;
-  struct FCBC fcbc;
-
-  list = search_head;
-  while (list != NULL)
-    {
-      if (list->searchpage == searchPage)
-        break;
-      list = list->next;
-    }
-  GNUNET_GE_ASSERT (ectx, list != NULL);
-  gtk_widget_hide (abortButton);
-  if (list->fsui_list != NULL)
-    {
-      fcbc.method = &GNUNET_FSUI_search_abort;
-      fcbc.argument = list->fsui_list;
-      GNUNET_GTK_run_with_save_calls (&fsui_callback, &fcbc);
-    }
-}
-
-static void
-stopSearch (GtkTreeModel * model,
-            GtkTreePath * path, GtkTreeIter * iter, gpointer unused)
-{
-  SearchList *s;
-  struct FCBC fcbc;
-
-  s = NULL;
-  gtk_tree_model_get (model, iter, SEARCH_SUMMARY_INTERNAL, &s, -1);
-  if (s != NULL)
-    {
-      if (s->fsui_list == NULL)
-        {
-          /* open directory - close directly */
-          fs_search_stopped (s);
-        }
-      else
-        {
-          fcbc.method = &GNUNET_FSUI_search_abort;
-          fcbc.argument = s->fsui_list;
-          GNUNET_GTK_run_with_save_calls (&fsui_callback, &fcbc);
-          fcbc.method = &GNUNET_FSUI_search_stop;
-          GNUNET_GTK_run_with_save_calls (&fsui_callback, &fcbc);
-        }
-    }
-}
-
-/**
- * The stop button in the search summary was clicked.
- */
-void
-on_closeSearchSummaryButton_clicked_fs (GtkWidget * treeview,
-                                        GtkWidget * closeButton)
-{
-  GtkTreeSelection *selection;
-
-  selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (treeview));
-  GNUNET_GTK_tree_selection_selected_foreach (selection, &stopSearch, NULL);
-}
-
-static void
-abortSearch (GtkTreeModel * model,
-             GtkTreePath * path, GtkTreeIter * iter, gpointer unused)
-{
-  SearchList *s;
-  struct FCBC fcbc;
-
-  s = NULL;
-  gtk_tree_model_get (model, iter, SEARCH_SUMMARY_INTERNAL, &s, -1);
-  if ((s != NULL) && (s->fsui_list != NULL))
-    {
-      fcbc.method = &GNUNET_FSUI_search_abort;
-      fcbc.argument = s->fsui_list;
-      GNUNET_GTK_run_with_save_calls (&fsui_callback, &fcbc);
-    }
-}
-
-/**
- * The abort button in the search summary was clicked.
- */
-void
-on_abortSearchSummaryButton_clicked_fs (GtkWidget * treeview,
-                                        GtkWidget * closeButton)
-{
-  GtkTreeSelection *selection;
-
-  selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (treeview));
-  GNUNET_GTK_tree_selection_selected_foreach (selection, &abortSearch, NULL);
-}
-
-
 /* end of search.c */