1 files changed, 21 insertions, 18 deletions

diff --git a/src/common/helper.c b/src/common/helper.c
index 504e5abe..2dcbe598 100644
--- a/src/common/helper.c
+++ b/src/common/helper.c
@@ -44,8 +44,9 @@
 typedef struct {
   struct SEMAPHORE * sem;
   void * args;
-  SimpleCallback func;
+  PThreadMain func;
   int destroyed;
+  void * rval;
 } SaveCall;
 
 typedef struct Plugin {
@@ -112,8 +113,7 @@ static gboolean saveCallWrapper(gpointer data) {
          pscCount-1);
     MUTEX_UNLOCK(sclock);
   }
-
-  call->func(call->args);
+  call->rval = call->func(call->args);
   if (call->sem != NULL)
     SEMAPHORE_UP(call->sem);
   return FALSE;
@@ -124,8 +124,8 @@ static gboolean saveCallWrapper(gpointer data) {
  * Since GTK doesn't work with multi-threaded applications under Windows,
  * all GTK operations have to be done in the main thread
  */
-void gtkSaveCall(SimpleCallback func,
-                 void * args) {
+void * gtkSaveCall(PThreadMain func,
+                   void * args) {
   SaveCall call;
 
   MUTEX_LOCK(sclock);
@@ -135,6 +135,7 @@ void gtkSaveCall(SimpleCallback func,
     call.func = func;
     call.sem  = SEMAPHORE_CREATE(0);
     call.destroyed = 0;
+    call.rval = NULL;
     GROW(psc,
          pscCount,
          pscCount+1);
@@ -145,9 +146,10 @@ void gtkSaveCall(SimpleCallback func,
     PTHREAD_STOP_SLEEP(mainThread);
     SEMAPHORE_DOWN(call.sem, YES);
     SEMAPHORE_DESTROY(call.sem);
+    return call.rval;
   } else {
     MUTEX_UNLOCK(sclock);
-    func(args);
+    return func(args);
   }
 }
 
@@ -171,7 +173,7 @@ typedef struct {
 /**
  * Callback for infoMessage()
  */
-static void doInfoMessage(void * args) {
+static void * doInfoMessage(void * args) {
   const InfoMessage * info = args;
   GtkTextIter iter;
   GtkTextBuffer * buffer;
@@ -185,6 +187,7 @@ static void doInfoMessage(void * args) {
                          &iter,
                          info->note,
                          -1);
+  return NULL;
 }
 
 /**
@@ -207,7 +210,7 @@ void infoMessage(int doPopup,
   g_free(info.note);
 }
 
-static void saveAddLogEntry(void * args) {
+static void * saveAddLogEntry(void * args) {
   static GtkWidget * s = NULL;
   static int once = 1;
   static guint id;
@@ -224,6 +227,7 @@ static void saveAddLogEntry(void * args) {
   gtk_statusbar_push(GTK_STATUSBAR(s),
                      id,
                      (const char*) args);
+  return NULL;
 }
 
 /**
@@ -487,10 +491,10 @@ static void * shutdownCode(void * arg) {
   return ret;
 }
 
-void run_with_save_calls(PThreadMain cb,
-                         void * arg) {
+void * run_with_save_calls(PThreadMain cb,
+                           void * arg) {
   struct PTHREAD * doneThread;
-  void * unused;
+  void * retval;
   struct rwsc_closure cls;
   int i;
 
@@ -525,8 +529,9 @@ void run_with_save_calls(PThreadMain cb,
     }
   }
   PTHREAD_JOIN(doneThread,
-               &unused);
+               &retval);
   SEMAPHORE_DESTROY(cls.sig);
+  return retval;
 }
 
 /**
@@ -627,8 +632,7 @@ char * validate_utf8(char * msg) {
 */
 void saveMainWindowState(GtkWidget *main_window,
                          GdkEventWindowState *event,
-                         gpointer user_data)
-{
+                         gpointer user_data) {
   main_window_state = (*event).new_window_state;
   return;
 }
@@ -636,14 +640,13 @@ void saveMainWindowState(GtkWidget *main_window,
 /**
 * Get the last main window state when restoring (tray icon use)
 */
-GdkWindowState getMainWindowState()
-{
+GdkWindowState getMainWindowState() {
   return main_window_state;
 }
 
 /**
-* Start gnunet-setup, asking for a password if needed
-*/
+ * Start gnunet-setup, asking for a password if needed
+ */
 gboolean startGNUnetSetup (gboolean run_wizard) {
   int code;
   char *error_message;