1 files changed, 61 insertions, 59 deletions

diff --git a/src/plugins/fs/search.c b/src/plugins/fs/search.c
index a78dd430..70c40aa7 100644
--- a/src/plugins/fs/search.c
+++ b/src/plugins/fs/search.c
@@ -164,7 +164,7 @@ fs_search_result_received (SearchList * searchContext,
   GtkTreeStore *model;
   GtkTreeIter iter;
   enum GNUNET_URITRACK_STATE state;
-  struct GNUNET_ECRS_URI * have;
+  struct GNUNET_ECRS_URI *have;
 
   state = GNUNET_URITRACK_get_state (ectx, cfg, info->uri);
   if ((state & (GNUNET_URITRACK_INSERTED |
@@ -175,20 +175,19 @@ fs_search_result_received (SearchList * searchContext,
                                                               GNUNET_YES)))
     return;
   model = GTK_TREE_STORE (gtk_tree_view_get_model (searchContext->treeview));
-  /* Check that the entry does not already exist (for resume!) */  
+  /* Check that the entry does not already exist (for resume!) */
   if (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (model), &iter))
     {
       do
-        {
-          have = NULL;
-          gtk_tree_model_get (GTK_TREE_MODEL(model),
-                              &iter, SEARCH_URI, &have, -1);
-          if ( (have != NULL) &&
-               (GNUNET_ECRS_uri_test_equal(have, uri)) )
-            return; /* duplicate */
-        }
-      while (gtk_tree_model_iter_next (GTK_TREE_MODEL(model), &iter));
-    }  
+        {
+          have = NULL;
+          gtk_tree_model_get (GTK_TREE_MODEL (model),
+                              &iter, SEARCH_URI, &have, -1);
+          if ((have != NULL) && (GNUNET_ECRS_uri_test_equal (have, uri)))
+            return;             /* duplicate */
+        }
+      while (gtk_tree_model_iter_next (GTK_TREE_MODEL (model), &iter));
+    }
   gtk_tree_store_append (model, &iter, NULL);
   addEntryToSearchTree (searchContext, NULL, info, &iter);
   searchContext->resultsReceived++;
@@ -310,7 +309,7 @@ on_save_search_activate (void *cls, GtkWidget * searchEntry)
   meta = GNUNET_ECRS_meta_data_create ();
   GNUNET_ECRS_meta_data_insert (meta, EXTRACTOR_KEYWORDS, list->searchString);
   GNUNET_ECRS_meta_data_insert (meta, EXTRACTOR_DESCRIPTION,
-                               _("Saved search results"));
+                                _("Saved search results"));
   GNUNET_ECRS_meta_data_insert (meta, EXTRACTOR_SOFTWARE, "gnunet-gtk");
   if (GNUNET_OK != GNUNET_ECRS_directory_create (NULL,
                                                  &directory, &dir_len,
@@ -405,18 +404,17 @@ fs_search_started (struct GNUNET_FSUI_SearchList * fsui_list,
   list = search_head;
   while (list != NULL)
     {
-      if ( (list->fsui_list == NULL) &&
-           (list->uri != NULL) &&
-           (GNUNET_ECRS_uri_test_equal(list->uri,
-                                       uri)) )
-        {
-          list->fsui_list = fsui_list;
-          for (i = 0; i < resultCount; i++)
-            fs_search_result_received (list, &results[i], uri);
-          if (resultCount == 0)  /* otherwise already done! */
-            updateSearchSummary (list);
-          return list;
-        }
+      if ((list->fsui_list == NULL) &&
+          (list->uri != NULL) &&
+          (GNUNET_ECRS_uri_test_equal (list->uri, uri)))
+        {
+          list->fsui_list = fsui_list;
+          for (i = 0; i < resultCount; i++)
+            fs_search_result_received (list, &results[i], uri);
+          if (resultCount == 0) /* otherwise already done! */
+            updateSearchSummary (list);
+          return list;
+        }
       list = list->next;
     }
 
@@ -643,12 +641,24 @@ freeIterSubtree (GtkTreeModel * tree, GtkTreeIter * iter)
 void
 fs_search_aborted (SearchList * list)
 {
-  gtk_widget_show(glade_xml_get_widget(list->searchXML,
-                                       "searchResumeButton"));
-  gtk_widget_show(glade_xml_get_widget(list->searchXML,
-                                       "searchAbortButton"));
-  gtk_widget_show(glade_xml_get_widget(list->searchXML,
-                                       "searchPauseButton"));
+  gtk_widget_show (glade_xml_get_widget (list->searchXML,
+                                         "searchResumeButton"));
+  gtk_widget_show (glade_xml_get_widget (list->searchXML,
+                                         "searchAbortButton"));
+  gtk_widget_show (glade_xml_get_widget (list->searchXML,
+                                         "searchPauseButton"));
+}
+
+void
+fs_search_paused (SearchList * list)
+{
+  /* nothing to be done */
+}
+
+void
+fs_search_restarted (SearchList * list)
+{
+  /* nothing to be done */
 }
 
 /**
@@ -666,14 +676,6 @@ fs_search_stopped (SearchList * list)
   int index;
   int i;
 
-  if (list->is_paused == GNUNET_YES)
-    {
-      /* if this was just a request to pause,
-         then simply ignore the FS-stopped event */
-      list->fsui_list = NULL;
-      list->is_paused = GNUNET_NO;
-      return;
-    }
   /* remove from linked list */
   if (search_head == list)
     {
@@ -760,8 +762,7 @@ static void *
 search_start_helper (void *cls)
 {
   FSSS *fsss = cls;
-  GNUNET_FSUI_search_start (ctx, fsss->anonymity,
-                            fsss->uri);
+  GNUNET_FSUI_search_start (ctx, fsss->anonymity, fsss->uri);
   return NULL;
 }
 
@@ -896,7 +897,7 @@ on_fssearchbutton_clicked_fs (gpointer dummy2, GtkWidget * searchButton)
       list = list->next;
     }
   fsss.anonymity = getSpinButtonValue (GNUNET_GTK_get_main_glade_XML (),
-                                       "searchAnonymitySelectionSpinButton");
+                                       "searchAnonymitySelectionSpinButton");
   GNUNET_GTK_run_with_save_calls (search_start_helper, &fsss);
   GNUNET_ECRS_uri_destroy (fsss.uri);
 }
@@ -942,7 +943,7 @@ on_closeSearchButton_clicked_fs (GtkWidget * searchPage,
   if (list->fsui_list == NULL)
     {
       /* open directory or paused search; 
-         close directly */
+         close directly */
       fs_search_stopped (list);
     }
   else
@@ -962,7 +963,7 @@ on_closeSearchButton_clicked_fs (GtkWidget * searchPage,
  */
 void
 on_searchPauseButton_clicked_fs (GtkWidget * searchPage,
-                                 GtkWidget * pauseButton)
+                                 GtkWidget * pauseButton)
 {
   SearchList *list;
   struct FCBC fcbc;
@@ -975,13 +976,12 @@ on_searchPauseButton_clicked_fs (GtkWidget * searchPage,
       list = list->next;
     }
   GNUNET_GE_ASSERT (ectx, list != NULL);
-  gtk_widget_hide(pauseButton);
-  gtk_widget_show(glade_xml_get_widget(list->searchXML,
-                                       "searchResumeButton"));
+  gtk_widget_hide (pauseButton);
+  gtk_widget_show (glade_xml_get_widget (list->searchXML,
+                                         "searchResumeButton"));
   if (list->fsui_list != NULL)
     {
-      list->is_paused = GNUNET_YES;
-      fcbc.method = &GNUNET_FSUI_search_stop;
+      fcbc.method = &GNUNET_FSUI_search_pause;
       fcbc.argument = list->fsui_list;
       GNUNET_GTK_run_with_save_calls (&fsui_callback, &fcbc);
     }
@@ -992,10 +992,10 @@ on_searchPauseButton_clicked_fs (GtkWidget * searchPage,
  */
 void
 on_searchResumeButton_clicked_fs (GtkWidget * searchPage,
-                                  GtkWidget * resumeButton)
+                                  GtkWidget * resumeButton)
 {
-  FSSS fsss;
   SearchList *list;
+  struct FCBC fcbc;
 
   list = search_head;
   while (list != NULL)
@@ -1005,13 +1005,15 @@ on_searchResumeButton_clicked_fs (GtkWidget * searchPage,
       list = list->next;
     }
   GNUNET_GE_ASSERT (ectx, list != NULL);
-  gtk_widget_hide(resumeButton);
-  gtk_widget_show(glade_xml_get_widget(list->searchXML,
-                                       "searchPauseButton"));
-  fsss.anonymity = getSpinButtonValue (GNUNET_GTK_get_main_glade_XML (),
-                                       "searchAnonymitySelectionSpinButton");
-  fsss.uri = list->uri;
-  GNUNET_GTK_run_with_save_calls (search_start_helper, &fsss);
+  gtk_widget_hide (resumeButton);
+  gtk_widget_show (glade_xml_get_widget (list->searchXML,
+                                         "searchPauseButton"));
+  if (list->fsui_list != NULL)
+    {
+      fcbc.method = &GNUNET_FSUI_search_restart;
+      fcbc.argument = list->fsui_list;
+      GNUNET_GTK_run_with_save_calls (&fsui_callback, &fcbc);
+    }
 }
 
 /**
@@ -1032,7 +1034,7 @@ on_abortSearchButton_clicked_fs (GtkWidget * searchPage,
       list = list->next;
     }
   GNUNET_GE_ASSERT (ectx, list != NULL);
-  gtk_widget_hide(abortButton);
+  gtk_widget_hide (abortButton);
   if (list->fsui_list != NULL)
     {
       fcbc.method = &GNUNET_FSUI_search_abort;