1 files changed, 15 insertions, 14 deletions

diff --git a/src/common/helper.c b/src/common/helper.c
index 2dcbe598..97ec690c 100644
--- a/src/common/helper.c
+++ b/src/common/helper.c
@@ -28,6 +28,7 @@
 #include "gnunetgtk_common.h"
 #include <GNUnet/gnunet_util_crypto.h>
 #include <glib.h>
+#include <gmodule.h>
 
 #define HELPER_DEBUG NO
 
@@ -154,15 +155,6 @@ void * gtkSaveCall(PThreadMain func,
 }
 
 /**
- * Callback for handling "delete_event": close the window
- */
-gint on_statusWindow_delete_event(GtkWidget * widget,
-                                  GdkEvent * event,
-                                  gpointer data) {
-  return FALSE;
-}
-
-/**
  * Closure for doInfoMessage.
  */
 typedef struct {
@@ -271,6 +263,7 @@ static void connector(const gchar *handler_name,
                       GObject *connect_object,
                       gboolean after,
                       gpointer user_data) {
+  GModule * module;
   GladeXML * xml = user_data;
   Plugin * plug;
   void * method;
@@ -289,11 +282,19 @@ static void connector(const gchar *handler_name,
                   "gnunet_gtk_main_quit"))
     method = shutdown_function;
   if (method == NULL) {
-    GE_LOG(ectx,
-           GE_WARNING | GE_DEVELOPER | GE_IMMEDIATE,
-           _("Failed to find handler for `%s'\n"),
-           handler_name);
-    return;
+    module = g_module_open(NULL, 0);
+    if ( (module == NULL) ||
+         (TRUE != g_module_symbol(module,
+                                handler_name,
+                                  &method)) ) {      
+      GE_LOG(ectx,
+             GE_WARNING | GE_DEVELOPER | GE_IMMEDIATE,
+             _("Failed to find handler for `%s'\n"),
+             handler_name);
+      g_module_close(module);
+      return;
+    }
+    g_module_close(module);
   }
   glade_xml_signal_connect(xml,
                            handler_name,