1 files changed, 7 insertions, 1 deletions

diff --git a/src/common/helper.c b/src/common/helper.c
index 08a0fe64..83a3667a 100644
--- a/src/common/helper.c
+++ b/src/common/helper.c
@@ -67,6 +67,8 @@ static int saveCallsUp;
 
 static Plugin * plugin;
 
+static void * shutdown_function;
+
 
 static gboolean saveCallWrapper(gpointer data) {
   SaveCall * call = data;
@@ -274,6 +276,9 @@ static void connector(const gchar *handler_name,
       break;
     plug = plug->next;
   }
+  if (0 == strcmp(handler_name,
+                  "gnunet_gtk_main_quit"))
+    method = shutdown_function;
   if (method == NULL) {
     LOG(LOG_DEBUG,
         _("Failed to find handler for `%s'\n"),
@@ -364,9 +369,10 @@ static void unloadPlugin(Plugin * plug) {
   FREE(plug);
 }
 
-void initGNUnetGTKCommon() {
+void initGNUnetGTKCommon(void * callback) {
   char * load;
 
+  shutdown_function = callback;
   MUTEX_CREATE_RECURSIVE(&sclock);
   PTHREAD_GET_SELF(&mainThread);
   saveCallsUp = YES;