diff options
author | Christian Grothoff <christian@grothoff.org> | 2006-10-30 00:37:18 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2006-10-30 00:37:18 +0000 |
commit | f5bfe66036b47fc4e048b520017ec32c8961cd8b (patch) | |
tree | 7fb6d8b69ed4067d0f577e4b478ba434cf85ed5f | |
parent | 10d8b6fb428da9bb3cb2140e9f460d992cd525a9 (diff) | |
download | gnunet-gtk-f5bfe66036b47fc4e048b520017ec32c8961cd8b.tar.gz gnunet-gtk-f5bfe66036b47fc4e048b520017ec32c8961cd8b.zip |
update
-rw-r--r-- | gnunet-gtk.glade | 5 | ||||
-rw-r--r-- | src/common/helper.c | 29 | ||||
-rw-r--r-- | src/plugins/fs/namespace.c | 2 |
3 files changed, 16 insertions, 20 deletions
diff --git a/gnunet-gtk.glade b/gnunet-gtk.glade index 6117e3c1..ce26468c 100644 --- a/gnunet-gtk.glade +++ b/gnunet-gtk.glade | |||
@@ -6032,10 +6032,6 @@ Daniel Nylander <po@danielnylander.se> | |||
6032 | <property name="gravity">GDK_GRAVITY_NORTH_WEST</property> | 6032 | <property name="gravity">GDK_GRAVITY_NORTH_WEST</property> |
6033 | <property name="focus_on_map">True</property> | 6033 | <property name="focus_on_map">True</property> |
6034 | <property name="urgency_hint">False</property> | 6034 | <property name="urgency_hint">False</property> |
6035 | <signal name="delete_event" handler="on_statusWindow_delete_event_" object="statusWindow" last_modification_time="Tue, 05 Jul 2005 22:11:54 GMT"/> | ||
6036 | <signal name="delete_event" handler="gtk_widget_hide" object="statusWindow" last_modification_time="Tue, 05 Jul 2005 22:12:30 GMT"/> | ||
6037 | <signal name="destroy" handler="gtk_widget_hide" object="statusWindow" last_modification_time="Tue, 05 Jul 2005 22:12:43 GMT"/> | ||
6038 | |||
6039 | <child> | 6035 | <child> |
6040 | <widget class="GtkVBox" id="vbox16"> | 6036 | <widget class="GtkVBox" id="vbox16"> |
6041 | <property name="visible">True</property> | 6037 | <property name="visible">True</property> |
@@ -6087,7 +6083,6 @@ Daniel Nylander <po@danielnylander.se> | |||
6087 | <property name="use_stock">True</property> | 6083 | <property name="use_stock">True</property> |
6088 | <property name="relief">GTK_RELIEF_NORMAL</property> | 6084 | <property name="relief">GTK_RELIEF_NORMAL</property> |
6089 | <property name="focus_on_click">True</property> | 6085 | <property name="focus_on_click">True</property> |
6090 | <signal name="clicked" handler="gtk_widget_hide" object="statusWindow" last_modification_time="Tue, 05 Jul 2005 22:16:05 GMT"/> | ||
6091 | </widget> | 6086 | </widget> |
6092 | <packing> | 6087 | <packing> |
6093 | <property name="padding">0</property> | 6088 | <property name="padding">0</property> |
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 @@ | |||
28 | #include "gnunetgtk_common.h" | 28 | #include "gnunetgtk_common.h" |
29 | #include <GNUnet/gnunet_util_crypto.h> | 29 | #include <GNUnet/gnunet_util_crypto.h> |
30 | #include <glib.h> | 30 | #include <glib.h> |
31 | #include <gmodule.h> | ||
31 | 32 | ||
32 | #define HELPER_DEBUG NO | 33 | #define HELPER_DEBUG NO |
33 | 34 | ||
@@ -154,15 +155,6 @@ void * gtkSaveCall(PThreadMain func, | |||
154 | } | 155 | } |
155 | 156 | ||
156 | /** | 157 | /** |
157 | * Callback for handling "delete_event": close the window | ||
158 | */ | ||
159 | gint on_statusWindow_delete_event(GtkWidget * widget, | ||
160 | GdkEvent * event, | ||
161 | gpointer data) { | ||
162 | return FALSE; | ||
163 | } | ||
164 | |||
165 | /** | ||
166 | * Closure for doInfoMessage. | 158 | * Closure for doInfoMessage. |
167 | */ | 159 | */ |
168 | typedef struct { | 160 | typedef struct { |
@@ -271,6 +263,7 @@ static void connector(const gchar *handler_name, | |||
271 | GObject *connect_object, | 263 | GObject *connect_object, |
272 | gboolean after, | 264 | gboolean after, |
273 | gpointer user_data) { | 265 | gpointer user_data) { |
266 | GModule * module; | ||
274 | GladeXML * xml = user_data; | 267 | GladeXML * xml = user_data; |
275 | Plugin * plug; | 268 | Plugin * plug; |
276 | void * method; | 269 | void * method; |
@@ -289,11 +282,19 @@ static void connector(const gchar *handler_name, | |||
289 | "gnunet_gtk_main_quit")) | 282 | "gnunet_gtk_main_quit")) |
290 | method = shutdown_function; | 283 | method = shutdown_function; |
291 | if (method == NULL) { | 284 | if (method == NULL) { |
292 | GE_LOG(ectx, | 285 | module = g_module_open(NULL, 0); |
293 | GE_WARNING | GE_DEVELOPER | GE_IMMEDIATE, | 286 | if ( (module == NULL) || |
294 | _("Failed to find handler for `%s'\n"), | 287 | (TRUE != g_module_symbol(module, |
295 | handler_name); | 288 | handler_name, |
296 | return; | 289 | &method)) ) { |
290 | GE_LOG(ectx, | ||
291 | GE_WARNING | GE_DEVELOPER | GE_IMMEDIATE, | ||
292 | _("Failed to find handler for `%s'\n"), | ||
293 | handler_name); | ||
294 | g_module_close(module); | ||
295 | return; | ||
296 | } | ||
297 | g_module_close(module); | ||
297 | } | 298 | } |
298 | glade_xml_signal_connect(xml, | 299 | glade_xml_signal_connect(xml, |
299 | handler_name, | 300 | handler_name, |
diff --git a/src/plugins/fs/namespace.c b/src/plugins/fs/namespace.c index 10dad5e1..e0c1808f 100644 --- a/src/plugins/fs/namespace.c +++ b/src/plugins/fs/namespace.c | |||
@@ -368,7 +368,7 @@ static void updateContentList(void * unused) { | |||
368 | gtkSaveCall(&doUpdateContentList, NULL); | 368 | gtkSaveCall(&doUpdateContentList, NULL); |
369 | } | 369 | } |
370 | 370 | ||
371 | void on_refreshContentListButton_clickedfs_(gpointer dummy, | 371 | void on_refreshContentListButton_clicked_fs(gpointer dummy, |
372 | gpointer dummy1) { | 372 | gpointer dummy1) { |
373 | updateContentList(NULL); | 373 | updateContentList(NULL); |
374 | } | 374 | } |