10 files changed, 32 insertions, 50 deletions

diff --git a/src/plugins/about/about.c b/src/plugins/about/about.c
index dbea4c75..0dcf032e 100644
--- a/src/plugins/about/about.c
+++ b/src/plugins/about/about.c
@@ -25,8 +25,8 @@
  * This file contains the about dialog.
  */
 
-#include "config.h"
-#include "helper.h"
+#include "platform.h"
+#include "gnunetgtk_common.h"
 
 /**
  * This displays an about window
diff --git a/src/plugins/daemon/daemon.c b/src/plugins/daemon/daemon.c
index 396989eb..df265a79 100644
--- a/src/plugins/daemon/daemon.c
+++ b/src/plugins/daemon/daemon.c
@@ -25,10 +25,11 @@
  */
 
 #include "platform.h"
-#include "helper.h"
-#include <GNUnet/gnunet_util.h>
+#include "gnunetgtk_common.h"
 
-static gint doUpdateMenus(SaveCall * call) {
+
+static void doUpdateMenus(void * arg) {
+  int ret = *(int*) arg;
   static GtkWidget * killEntry = NULL;
   static GtkWidget * launchEntry = NULL;
   static GtkWidget * statsEntryYes = NULL;
@@ -36,9 +37,7 @@ static gint doUpdateMenus(SaveCall * call) {
   static int once = 1;
   static int isLocal;
   char * host;
-  int ret;
 
-  ret = * (int*) call->args;
   if (once) {
     once = 0;
     killEntry
@@ -73,8 +72,6 @@ static gint doUpdateMenus(SaveCall * call) {
     gtk_widget_set_sensitive(killEntry, TRUE);
     gtk_widget_set_sensitive(launchEntry, FALSE);
   }    
-  gtkSaveCallDone(call->sem);
-  return FALSE;
 }
 
 static void cronCheckDaemon(void * dummy) {
@@ -84,7 +81,7 @@ static void cronCheckDaemon(void * dummy) {
   ret = checkGNUnetDaemonRunning();
   if (ret != last) {
     last = ret;    
-    gtkSaveCall((GtkFunction) doUpdateMenus, &ret);
+    gtkSaveCall(&doUpdateMenus, &ret);
   }      
 }
 
diff --git a/src/plugins/fs/download.c b/src/plugins/fs/download.c
index 644005b4..9947a2ef 100644
--- a/src/plugins/fs/download.c
+++ b/src/plugins/fs/download.c
@@ -25,9 +25,10 @@
  */
 
 #include "platform.h"
+#include "gnunetgtk_common.h"
 #include "download.h"
 #include "search.h"
-#include "helper.h"
+#include "fs.h"
 #include <extractor.h>
 
 typedef struct DL {
diff --git a/src/plugins/fs/download.h b/src/plugins/fs/download.h
index 3a0a9463..a897d458 100644
--- a/src/plugins/fs/download.h
+++ b/src/plugins/fs/download.h
@@ -19,7 +19,7 @@
 */
 
 /**
- * @file src/download.h
+ * @file src/plugins/fs/download.h
  * @brief code for downloading with gnunet-gtk
  * @author Christian Grothoff
  */
@@ -27,9 +27,7 @@
 #ifndef GTK_DOWNLOAD_H
 #define GTK_DOWNLOAD_H
 
-#include "helper.h"
-#include "fs.h"
-
+#include <GNUnet/gnunet_ecrs_lib.h>
 
 /**
  */
@@ -47,5 +45,4 @@ void fs_download_start(void);
 
 void fs_download_stop(void);
 
-
 #endif
diff --git a/src/plugins/fs/fs.c b/src/plugins/fs/fs.c
index 8ee954a6..6b30d9d5 100644
--- a/src/plugins/fs/fs.c
+++ b/src/plugins/fs/fs.c
@@ -24,8 +24,9 @@
  * @author Christian Grothoff
  */
 
+#include "platform.h"
+#include "gnunetgtk_common.h"
 #include "fs.h"
-#include "helper.h"
 #include "download.h"
 #include "search.h"
 #include "upload.h"
@@ -33,10 +34,9 @@
 
 struct FSUI_Context * ctx;
 
-static gint saveEventProcessor(SaveCall * call) {
-  const FSUI_Event * event;
+static void saveEventProcessor(void * arg) {
+  const FSUI_Event * event = arg;
 
-  event = (const FSUI_Event *) call->args;
   switch (event->type) {
   case FSUI_search_result:
     displaySearchResult(&event->data.SearchResult.fi,
@@ -106,9 +106,6 @@ static gint saveEventProcessor(SaveCall * call) {
         event->type);
     break;
   }
-
-  gtkSaveCallDone(call->sem);
-  return FALSE;
 }
 
 /**
@@ -116,7 +113,7 @@ static gint saveEventProcessor(SaveCall * call) {
  */
 static void eventProcessor(void * cls,
                            const FSUI_Event * event) {
-  gtkSaveCall((GtkFunction) &saveEventProcessor,
+  gtkSaveCall(&saveEventProcessor,
               (void*) event);
 }
 
diff --git a/src/plugins/fs/fs.h b/src/plugins/fs/fs.h
index f08904fc..085fb7ff 100644
--- a/src/plugins/fs/fs.h
+++ b/src/plugins/fs/fs.h
@@ -19,7 +19,7 @@
 */
 
 /**
- * @file src/fs.h
+ * @file src/plugins/fs/fs.h
  * @brief file-sharing globals of gnunet-gtk
  * @author Christian Grothoff
  */
@@ -27,7 +27,6 @@
 #ifndef GTK_FS_H
 #define GTK_FS_H
 
-#include <GNUnet/gnunet_util.h>
 #include <GNUnet/gnunet_ecrs_lib.h>
 #include <GNUnet/gnunet_fsui_lib.h>
 
@@ -80,11 +79,6 @@ enum {
   KTYPE_NUM,
 };
 
-
 extern struct FSUI_Context * ctx;
 
-void gtk_fs_init(void);
-
-void gtk_fs_done(void);
-
 #endif
diff --git a/src/plugins/fs/search.c b/src/plugins/fs/search.c
index 6fc8d830..ea98f4e4 100644
--- a/src/plugins/fs/search.c
+++ b/src/plugins/fs/search.c
@@ -25,8 +25,9 @@
  */
 
 #include "platform.h"
+#include "gnunetgtk_common.h"
 #include "search.h"
-#include "helper.h"
+#include "fs.h"
 #include <extractor.h>
 
 /**
@@ -617,7 +618,7 @@ static int addNamespace(GtkListStore * model,
  * cron job that periodically updates the model for the
  * namespace selection in the search vbox.
  */
-static gint updateNCBModelSafe(SaveCall * call) {
+static void updateNCBModelSafe(void * unused) {
   GtkWidget * searchNamespaceCB;
   GtkListStore * model;
   GtkTreeIter iter;
@@ -644,12 +645,10 @@ static gint updateNCBModelSafe(SaveCall * call) {
   if (-1 == gtk_combo_box_get_active(GTK_COMBO_BOX(searchNamespaceCB)))
     gtk_combo_box_set_active(GTK_COMBO_BOX(searchNamespaceCB),
                              0);
-  gtkSaveCallDone(call->sem);
-  return FALSE;
 }
 
-static void updateNCBModel(void * call) {
-  gtkSaveCall((GtkFunction) updateNCBModelSafe, NULL);
+static void updateNCBModel(void * dummy) {
+  gtkSaveCall(&updateNCBModelSafe, NULL);
 }
 
 /**
diff --git a/src/plugins/fs/search.h b/src/plugins/fs/search.h
index c2c84d9c..b134ce3e 100644
--- a/src/plugins/fs/search.h
+++ b/src/plugins/fs/search.h
@@ -19,7 +19,7 @@
 */
 
 /**
- * @file src/search.h
+ * @file src/plugins/fs/search.h
  * @brief code for searching with gnunet-gtk
  * @author Christian Grothoff
  */
@@ -27,8 +27,7 @@
 #ifndef GTK_SEARCH_H
 #define GTK_SEARCH_H
 
-#include "helper.h"
-#include "fs.h"
+#include <GNUnet/gnunet_ecrs_lib.h>
 
 /**
  * Add an entry to the search tree.
diff --git a/src/plugins/fs/upload.c b/src/plugins/fs/upload.c
index 63c5e03d..112935a1 100644
--- a/src/plugins/fs/upload.c
+++ b/src/plugins/fs/upload.c
@@ -19,21 +19,23 @@
 */
 
 /**
- * @file src/upload.c
+ * @file src/plugins/fs/upload.c
  * @brief code for uploading with gnunet-gtk
  * @author Christian Grothoff
  */
 
 #include "platform.h"
+#include "gnunetgtk_common.h"
 #include "search.h"
 #include "upload.h"
+#include "fs.h"
 #include <extractor.h>
 
 #ifdef MINGW
-        #include <shlobj.h>
-        #ifndef BIF_NONEWFOLDERBUTTON
-                #define BIF_NONEWFOLDERBUTTON 0x200
-        #endif
+#include <shlobj.h>
+#ifndef BIF_NONEWFOLDERBUTTON
+#define BIF_NONEWFOLDERBUTTON 0x200
+#endif
 #endif
 
 
diff --git a/src/plugins/fs/upload.h b/src/plugins/fs/upload.h
index fd1083d1..1f34b118 100644
--- a/src/plugins/fs/upload.h
+++ b/src/plugins/fs/upload.h
@@ -19,7 +19,7 @@
 */
 
 /**
- * @file src/upload.h
+ * @file src/plugins/fs/upload.h
  * @brief code for uploading with gnunet-gtk
  * @author Christian Grothoff
  */
@@ -27,9 +27,6 @@
 #ifndef GTK_UPLOAD_H
 #define GTK_UPLOAD_H
 
-#include "helper.h"
-#include "fs.h"
-
 /**
  */
 void displayUploadUpdate(const char * mainName,
@@ -57,7 +54,6 @@ void displayUploadResult(const ECRS_FileInfo * info,
                          const struct ECRS_URI * uri,
                          GtkTreeRowReference * row);
 
-
 void fs_upload_start(void);
 
 void fs_upload_stop(void);