fixing 894

3 files changed, 29 insertions, 29 deletions

diff --git a/src/core/main.c b/src/core/main.c
index f4185df7..977e041e 100644
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -88,9 +88,20 @@ static int parseOptions(int argc,
   return OK;
 }
 
+static void * shutdownCode(void * arg) {
+  Semaphore * sig = arg;
+  stopCron();
+  doneGNUnetGTKCommon();
+  SEMAPHORE_UP(sig);
+  return NULL;
+}
+
 int main(int argc, 
          char *argv[]) {
   GtkWidget * root;
+  PTHREAD_T doneThread;
+  Semaphore * sig;
+  void * unused;
   
   g_thread_init(NULL);
   gtk_init(&argc, &argv);
@@ -122,10 +133,18 @@ int main(int argc,
   gtk_main();
   gdk_threads_leave();
   setCustomLogProc(NULL);
-  while (YES == gtkRunSomeSaveCalls()) ;    
-  stopCron();
 
-  doneGNUnetGTKCommon();
+  sig = SEMAPHORE_NEW(0);
+  if (0 != PTHREAD_CREATE(&doneThread,
+                          &shutdownCode,
+                          sig,
+                          64*1024))
+    DIE_STRERROR("pthread_create");
+  while (OK != SEMAPHORE_DOWN_NONBLOCKING(sig))
+    gtkRunSomeSaveCalls();
+  PTHREAD_JOIN(&doneThread,
+               &unused);
+  SEMAPHORE_FREE(sig);
   doneUtil();
   
   return 0;
diff --git a/src/plugins/fs/fs.c b/src/plugins/fs/fs.c
index a0d1e227..37bae3fd 100644
--- a/src/plugins/fs/fs.c
+++ b/src/plugins/fs/fs.c
@@ -115,17 +115,6 @@ static void eventProcessor(void * cls,
               (void*) event);
 }
 
-static void * shutdownCode(Semaphore * sig) {
-  fs_download_stop();
-  fs_search_stop();
-  fs_collection_stop();
-  fs_namespace_stop();
-  fs_upload_stop();
-  FSUI_stop(ctx);
-  SEMAPHORE_UP(sig);
-  return NULL;
-}
-
 void init_fs() {
   GtkWidget * tab;
   GtkWidget * book;
@@ -153,21 +142,12 @@ void init_fs() {
 }
 
 void done_fs() {
-  PTHREAD_T doneThread;
-  Semaphore * sig;
-  void * unused;
-
-  sig = SEMAPHORE_NEW(0);
-  if (0 != PTHREAD_CREATE(&doneThread,
-                          (PThreadMain)&shutdownCode,
-                          sig,
-                          64*1024))
-    DIE_STRERROR("pthread_create");
-  while (OK != SEMAPHORE_DOWN_NONBLOCKING(sig))
-    gtkRunSomeSaveCalls();
-  PTHREAD_JOIN(&doneThread,
-               &unused);
-  SEMAPHORE_FREE(sig);
+  fs_download_stop();
+  fs_search_stop();
+  fs_collection_stop();
+  fs_namespace_stop();
+  fs_upload_stop();
+  FSUI_stop(ctx);
 }
 
 /* end of fs.c */
diff --git a/src/plugins/fs/upload.c b/src/plugins/fs/upload.c
index ff7856d8..259c8c86 100644
--- a/src/plugins/fs/upload.c
+++ b/src/plugins/fs/upload.c
@@ -374,6 +374,7 @@ void on_fsinsertuploadbutton_clicked(gpointer dummy,
                      gtk_spin_button_get_value_as_int
                      (GTK_SPIN_BUTTON(spin)),
                      doIndex,
+                     NO, /* FIXME: make option! */
                      meta,
                      gkeywordURI,
                      keywordURI);