[GNUnet-SVN] r3568 - in gnunet-gtk: . src/common src/plugins/fs

[grothoff]

Author: grothoff
Date: 2006-10-29 16:37:18 -0800 (Sun, 29 Oct 2006)
New Revision: 3568

Modified:
   gnunet-gtk/gnunet-gtk.glade
   gnunet-gtk/src/common/helper.c
   gnunet-gtk/src/plugins/fs/namespace.c
Log:
update

Modified: gnunet-gtk/gnunet-gtk.glade
===================================================================
--- gnunet-gtk/gnunet-gtk.glade 2006-10-29 23:57:48 UTC (rev 3567)
+++ gnunet-gtk/gnunet-gtk.glade 2006-10-30 00:37:18 UTC (rev 3568)
@@ -6032,10 +6032,6 @@
   <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
   <property name="focus_on_map">True</property>
   <property name="urgency_hint">False</property>
-  <signal name="delete_event" handler="on_statusWindow_delete_event_" 
object="statusWindow" last_modification_time="Tue, 05 Jul 2005 22:11:54 GMT"/>
-  <signal name="delete_event" handler="gtk_widget_hide" object="statusWindow" 
last_modification_time="Tue, 05 Jul 2005 22:12:30 GMT"/>
-  <signal name="destroy" handler="gtk_widget_hide" object="statusWindow" 
last_modification_time="Tue, 05 Jul 2005 22:12:43 GMT"/>
-
   <child>
     <widget class="GtkVBox" id="vbox16">
       <property name="visible">True</property>
@@ -6087,7 +6083,6 @@
          <property name="use_stock">True</property>
          <property name="relief">GTK_RELIEF_NORMAL</property>
          <property name="focus_on_click">True</property>
-         <signal name="clicked" handler="gtk_widget_hide" 
object="statusWindow" last_modification_time="Tue, 05 Jul 2005 22:16:05 GMT"/>
        </widget>
        <packing>
          <property name="padding">0</property>

Modified: gnunet-gtk/src/common/helper.c
===================================================================
--- gnunet-gtk/src/common/helper.c      2006-10-29 23:57:48 UTC (rev 3567)
+++ gnunet-gtk/src/common/helper.c      2006-10-30 00:37:18 UTC (rev 3568)
@@ -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 @@
 }
 
 /**
- * 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 @@
                      GObject *connect_object,
                      gboolean after,
                      gpointer user_data) {
+  GModule * module;
   GladeXML * xml = user_data;
   Plugin * plug;
   void * method;
@@ -289,11 +282,19 @@
                  "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,

Modified: gnunet-gtk/src/plugins/fs/namespace.c
===================================================================
--- gnunet-gtk/src/plugins/fs/namespace.c       2006-10-29 23:57:48 UTC (rev 
3567)
+++ gnunet-gtk/src/plugins/fs/namespace.c       2006-10-30 00:37:18 UTC (rev 
3568)
@@ -368,7 +368,7 @@
   gtkSaveCall(&doUpdateContentList, NULL);
 }
 
-void on_refreshContentListButton_clickedfs_(gpointer dummy,
+void on_refreshContentListButton_clicked_fs(gpointer dummy,
                                            gpointer dummy1) {
   updateContentList(NULL);
 }