fix

2 files changed, 7 insertions, 3 deletions

diff --git a/src/common/helper.c b/src/common/helper.c
index c8065716..255f9f3b 100644
--- a/src/common/helper.c
+++ b/src/common/helper.c
@@ -254,9 +254,11 @@ static void connector(const gchar *handler_name,
                       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 @@ static void connector(const gchar *handler_name,
         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)();
diff --git a/src/plugins/fs/upload.c b/src/plugins/fs/upload.c
index a2618809..20792968 100644
--- a/src/plugins/fs/upload.c
+++ b/src/plugins/fs/upload.c
@@ -250,6 +250,7 @@ static int publishMetaData(EXTRACTOR_KeywordType type,
   GtkTreeIter iter;
 
   stype = EXTRACTOR_getKeywordTypeAsString(type);
+  GNUNET_ASSERT(stype != NULL);
   gtk_list_store_append(store,
                         &iter);
   gtk_list_store_set(store,