1 files changed, 34 insertions, 19 deletions

diff --git a/src/plugins/fs/search.c b/src/plugins/fs/search.c
index d8521179..6d7504c1 100644
--- a/src/plugins/fs/search.c
+++ b/src/plugins/fs/search.c
@@ -511,6 +511,22 @@ void on_fssearchKeywordComboBoxEntry_changed_fs(gpointer dummy2,
                            strlen(searchString) > 0);
 }
 
+typedef struct {
+  unsigned int anonymity;
+  unsigned int max;
+  cron_t delay;
+  struct ECRS_URI * uri;
+} FSSS;
+
+static void * search_start_helper(void * cls) {
+  FSSS * fsss;
+  FSUI_startSearch(ctx,
+                   fsss->anonymity,
+                   fsss->max,
+                   fsss->delay,
+                   fsss->uri);
+  return NULL;
+}
 
 /**
  * The user has clicked the "SEARCH" button.
@@ -518,7 +534,7 @@ void on_fssearchKeywordComboBoxEntry_changed_fs(gpointer dummy2,
  */
 void on_fssearchbutton_clicked_fs(gpointer dummy2,
                                   GtkWidget * searchButton) {
-  struct ECRS_URI * uri;
+  FSSS fsss;
   const char * searchString;
   gint pages;
   gint i;
@@ -554,7 +570,7 @@ void on_fssearchbutton_clicked_fs(gpointer dummy2,
                        0, searchString,
                        -1);
   }
-  uri = NULL;
+  fsss.uri = NULL;
   /* check for namespace search */
   searchNamespaceGtkCB
     = glade_xml_get_widget(getMainXML(),
@@ -593,8 +609,8 @@ void on_fssearchbutton_clicked_fs(gpointer dummy2,
       strcat(ustring, ns);
       strcat(ustring, "/");
       strcat(ustring, searchString);
-      uri = ECRS_stringToUri(ectx, ustring);
-      if (uri == NULL) {
+      fsss.uri = ECRS_stringToUri(ectx, ustring);
+      if (fsss.uri == NULL) {
         GE_LOG(ectx,
                GE_ERROR | GE_BULK | GE_USER,
                _("Failed to create namespace URI from `%s'.\n"),
@@ -607,9 +623,9 @@ void on_fssearchbutton_clicked_fs(gpointer dummy2,
     if (ns != NULL)
       free(ns);
   }
-  if (uri == NULL)
-    uri = ECRS_parseCharKeywordURI(ectx, searchString);
-  if (uri == NULL) {
+  if (fsss.uri == NULL)
+    fsss.uri = ECRS_parseCharKeywordURI(ectx, searchString);
+  if (fsss.uri == NULL) {
     GE_BREAK(ectx, 0);
     return;
   }
@@ -621,14 +637,14 @@ void on_fssearchbutton_clicked_fs(gpointer dummy2,
   list = search_head;
   while (list != NULL) {
     if (ECRS_equalsUri(list->uri,
-                       uri)) {
+                       fsss.uri)) {
       for (i=0;i<pages;i++) {
         if (gtk_notebook_get_nth_page(notebook,
                                       i)
             == list->searchpage) {
           gtk_notebook_set_current_page(notebook,
                                         i);
-          ECRS_freeUri(uri);
+          ECRS_freeUri(fsss.uri);
           return;
         }
       }
@@ -636,16 +652,15 @@ void on_fssearchbutton_clicked_fs(gpointer dummy2,
     }
     list = list->next;
   }
-  /* FIXME: deadlock! */
-  FSUI_startSearch(ctx,
-                   getSpinButtonValue(getMainXML(),
-                                      "searchAnonymitySelectionSpinButton"),    
-                   getSpinButtonValue(getMainXML(),
-                                      "maxResultsSpinButton"),  
-                   getSpinButtonValue(getMainXML(),
-                                      "searchDelaySpinButton") * cronSECONDS,
-                   uri);
-  ECRS_freeUri(uri);
+  fsss.anonymity = getSpinButtonValue(getMainXML(),
+                                      "searchAnonymitySelectionSpinButton");
+  fsss.max = getSpinButtonValue(getMainXML(),
+                                "maxResultsSpinButton");
+  fsss.delay = getSpinButtonValue(getMainXML(),
+                                  "searchDelaySpinButton") * cronSECONDS;
+  run_with_save_calls(search_start_helper,
+                      &fsss);
+  ECRS_freeUri(fsss.uri);
 }
 
 struct FCBC {