1 files changed, 61 insertions, 35 deletions

diff --git a/src/plugins/fs/upload.c b/src/plugins/fs/upload.c
index aa800b34..f5b922f6 100644
--- a/src/plugins/fs/upload.c
+++ b/src/plugins/fs/upload.c
@@ -316,16 +316,48 @@ void on_fileInformationKeywordEntry_changed_fs(gpointer dummy2,
                            strlen(input) > 0);
 }
 
+typedef struct {
+  const char * filename;
+  unsigned int anonymity;
+  unsigned int priority;
+  int index;
+  int extract;
+  int deep_index;
+  cron_t expire;
+  struct ECRS_MetaData * meta;
+  struct ECRS_URI * gkeywordURI;
+  struct ECRS_URI * keywordURI;
+} FSUC;
+
+static void * start_upload_helper(void * cls) {
+  FSUC * fsuc = cls;
+  
+  FSUI_startUpload(ctx,
+                   fsuc->filename,
+                   (DirectoryScanCallback) &disk_directory_scan,
+                   ectx,
+                   fsuc->anonymity,
+                   fsuc->priority,
+                   fsuc->index,
+                   fsuc->extract,
+                   fsuc->deep_index,
+                   fsuc->expire,
+                   fsuc->meta,
+                   fsuc->gkeywordURI,
+                   fsuc->keywordURI);
+  return NULL;
+}
+
+
 void on_fsinsertuploadbutton_clicked_fs(gpointer dummy,
                                         GtkWidget * uploadButton) {
+  FSUC fsuc;
   const char * filenamerest;
-  const char * filename;
   GtkWidget * dialog;
   EXTRACTOR_ExtractorList * extractors;
   char * config;
-  struct ECRS_URI * keywordURI;
-  struct ECRS_URI * gkeywordURI;
   struct ECRS_MetaData * meta;
+  struct ECRS_URI * keywordURI;
 
   extractors = EXTRACTOR_loadDefaultLibraries();
   config = NULL;
@@ -340,8 +372,8 @@ void on_fsinsertuploadbutton_clicked_fs(gpointer dummy,
     FREE(config);
   }
 
-  filename = getEntryLineValue(getMainXML(),
-                               "uploadFilenameComboBoxEntry");
+  fsuc.filename = getEntryLineValue(getMainXML(),
+                                    "uploadFilenameComboBoxEntry");
   metaXML
     = glade_xml_new(getGladeFileName(),
                     "metaDataDialog",
@@ -352,11 +384,11 @@ void on_fsinsertuploadbutton_clicked_fs(gpointer dummy,
   meta = ECRS_createMetaData();
   ECRS_extractMetaData(ectx,
                        meta,
-                       filename,
+                       fsuc.filename,
                        extractors);
   EXTRACTOR_removeAll(extractors);
-  filenamerest = &filename[strlen(filename)-1];
-  while ( (filenamerest > filename) &&
+  filenamerest = &fsuc.filename[strlen(fsuc.filename)-1];
+  while ( (filenamerest > fsuc.filename) &&
           (filenamerest[-1] != DIR_SEPARATOR) )
     filenamerest--;
   ECRS_addToMetaData(meta,
@@ -397,36 +429,30 @@ void on_fsinsertuploadbutton_clicked_fs(gpointer dummy,
   gtk_dialog_set_default_response(GTK_DIALOG(dialog),
                                   GTK_RESPONSE_OK);
   if (gtk_dialog_run(GTK_DIALOG(dialog)) != GTK_RESPONSE_CANCEL) {
-    meta = getMetaDataFromList(metaXML,
-                               "metaDataDialogMetaDataList",
-                               "previewImage");
-    keywordURI = getKeywordURIFromList(metaXML,
+    fsuc.anonymity = getSpinButtonValue(getMainXML(),
+                                        "uploadAnonymityLevelSpinButton");
+    fsuc.priority = getSpinButtonValue(getMainXML(),
+                                       "contentPrioritySpinButton");
+    fsuc.index = getToggleButtonValue(getMainXML(),
+                                      "indexbutton");
+    fsuc.extract = getToggleButtonValue(getMainXML(),
+                                        "doExtractCheckButton");
+    fsuc.deep_index = getToggleButtonValue(getMainXML(),
+                                           "deepIndexCheckButton");
+    fsuc.expire = get_time() + 2 * cronYEARS;
+    fsuc.meta = getMetaDataFromList(metaXML,
+                                    "metaDataDialogMetaDataList",
+                                    "previewImage");
+    fsuc.keywordURI = getKeywordURIFromList(metaXML,
                                        "metaDataDialogKeywordList");
-    gkeywordURI = ECRS_stringToUri(ectx,
+    fsuc.gkeywordURI = ECRS_stringToUri(ectx,
                                    ECRS_URI_PREFIX
                                    ECRS_SEARCH_INFIX);
-    /* FIXME: DEADLOCK! */
-    FSUI_startUpload(ctx,
-                     filename,
-                     (DirectoryScanCallback) &disk_directory_scan,
-                     ectx,
-                     getSpinButtonValue(getMainXML(),
-                                        "uploadAnonymityLevelSpinButton"),
-                     getSpinButtonValue(getMainXML(),
-                                        "contentPrioritySpinButton"),
-                     getToggleButtonValue(getMainXML(),
-                                          "indexbutton"),
-                     getToggleButtonValue(getMainXML(),
-                                          "doExtractCheckButton"),
-                     getToggleButtonValue(getMainXML(),
-                                          "deepIndexCheckButton"),
-                     get_time() + 2 * cronYEARS,
-                     meta,
-                     gkeywordURI,
-                     keywordURI);
-    ECRS_freeMetaData(meta);
-    ECRS_freeUri(gkeywordURI);
-    ECRS_freeUri(keywordURI);
+    run_with_save_calls(&start_upload_helper,
+                        &fsuc);
+    ECRS_freeMetaData(fsuc.meta);
+    ECRS_freeUri(fsuc.gkeywordURI);
+    ECRS_freeUri(fsuc.keywordURI);
   }
   gtk_widget_destroy (dialog);
   UNREF(metaXML);