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

[grothoff]

Author: grothoff
Date: 2005-07-09 05:05:47 -0700 (Sat, 09 Jul 2005)
New Revision: 1337

Modified:
   gnunet-gtk/src/common/helper.c
   gnunet-gtk/src/plugins/fs/upload.c
Log:
fix

Modified: gnunet-gtk/src/common/helper.c
===================================================================
--- gnunet-gtk/src/common/helper.c      2005-07-09 00:08:11 UTC (rev 1336)
+++ gnunet-gtk/src/common/helper.c      2005-07-09 12:05:47 UTC (rev 1337)
@@ -254,9 +254,11 @@
                      GObject *connect_object,
                      gboolean after,
                      gpointer user_data) {
-  Plugin * plug = user_data;
+  GladeXML * xml = user_data;
+  Plugin * plug;
   void * method;
 
+  plug = plugin;
   method = NULL;
   while (plug != NULL) {
     method = trybindDynamicMethod(plug->library,
@@ -272,14 +274,15 @@
        handler_name);
     return;
   }
-  glade_xml_signal_connect(getMainXML(),
+  glade_xml_signal_connect(xml,
                           handler_name,
                           (GCallback) method);
 }
 
 void connectGladeWithPlugins(GladeXML * xml) {
   glade_xml_signal_autoconnect_full(xml,
-                                   &connector, plugin);
+                                   &connector,
+                                   xml);
 }
 
 typedef void (*PlainCall)();

Modified: gnunet-gtk/src/plugins/fs/upload.c
===================================================================
--- gnunet-gtk/src/plugins/fs/upload.c  2005-07-09 00:08:11 UTC (rev 1336)
+++ gnunet-gtk/src/plugins/fs/upload.c  2005-07-09 12:05:47 UTC (rev 1337)
@@ -250,6 +250,7 @@
   GtkTreeIter iter;
 
   stype = EXTRACTOR_getKeywordTypeAsString(type);
+  GNUNET_ASSERT(stype != NULL);
   gtk_list_store_append(store,
                        &iter);
   gtk_list_store_set(store,