Merge lp:~larsu/indicator-appmenu/dont-disconnect-non-existing-signals into lp:indicator-appmenu/14.04

[Lars Karlitski]

window-menu-model: disconnect entry signal handlers by func instead of id

entry_object_free disconnected signal handlers by id. This throws warnings when entry_object_free is called when disposing an object, because signals are already disconnected at that point.

This patch uses g_signal_handlers_disconnect_by_func(), which works both when the entry is alive and being disposed.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:247
http://jenkins.qa.ubuntu.com/job/indicator-appmenu-ci/11/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-appmenu-trusty-amd64-ci/6
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-appmenu-trusty-armhf-ci/6
        deb: http://jenkins.qa.ubuntu.com/job/indicator-appmenu-trusty-armhf-ci/6/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/indicator-appmenu-ci/11/rebuild

review: Approve (continuous-integration)

[Charles Kerr (charlesk)]

review: Approve

=== modified file 'src/window-menu-model.c'
--- src/window-menu-model.c	2013-10-24 12:58:52 +0000
+++ src/window-menu-model.c	2013-10-27 00:49:24 +0000
@@ -263,38 +263,8 @@
 	IndicatorObjectEntry entry;
 
 	GtkMenuItem * gmi;
-
-	gulong label_sig;
-	gulong sensitive_sig;
-	gulong visible_sig;
 };
 
-/* Destroy and unref the items of the object entry */
-static void
-entry_object_free (gpointer inentry)
-{
-	WindowMenuEntry * entry = (WindowMenuEntry *)inentry;
-
-	if (entry->label_sig != 0) {
-		g_signal_handler_disconnect(entry->gmi, entry->label_sig);
-	}
-
-	if (entry->sensitive_sig != 0) {
-		g_signal_handler_disconnect(entry->gmi, entry->sensitive_sig);
-	}
-
-	if (entry->visible_sig != 0) {
-		g_signal_handler_disconnect(entry->gmi, entry->visible_sig);
-	}
-
-	g_clear_object(&entry->entry.label);
-	g_clear_object(&entry->entry.image);
-	g_clear_object(&entry->entry.menu);
-
-	g_free(entry);
-	return;
-}
-
 /* Sync the menu label changing to the label object */
 static void
 entry_label_notify (GObject * obj, GParamSpec * pspec, gpointer user_data)
@@ -354,6 +324,24 @@
 	return;
 }
 
+/* Destroy and unref the items of the object entry */
+static void
+entry_object_free (gpointer inentry)
+{
+	WindowMenuEntry * entry = (WindowMenuEntry *)inentry;
+
+	g_signal_handlers_disconnect_by_func (entry->gmi, entry_label_notify, entry);
+	g_signal_handlers_disconnect_by_func (entry->gmi, entry_sensitive_notify, entry);
+	g_signal_handlers_disconnect_by_func (entry->gmi, entry_visible_notify, entry);
+
+	g_clear_object(&entry->entry.label);
+	g_clear_object(&entry->entry.image);
+	g_clear_object(&entry->entry.menu);
+
+	g_free(entry);
+	return;
+}
+
 /* Put an entry on a menu item */
 static void
 entry_on_menuitem (WindowMenuModel * menu, GtkMenuItem * gmi)
@@ -385,7 +373,7 @@
 
 		entry->entry.label = GTK_LABEL(gtk_label_new(label));
 		gtk_widget_show(GTK_WIDGET(entry->entry.label));
-		entry->label_sig = g_signal_connect(G_OBJECT(gmi), "notify::label", G_CALLBACK(entry_label_notify), entry->entry.label);
+		g_signal_connect(G_OBJECT(gmi), "notify::label", G_CALLBACK(entry_label_notify), entry);
 	}
 
 	if (entry->entry.label != NULL) {
@@ -400,8 +388,8 @@
 		g_object_ref_sink(entry->entry.menu);
 	}
 
-	entry->sensitive_sig = g_signal_connect(G_OBJECT(gmi), "notify::sensitive", G_CALLBACK(entry_sensitive_notify), entry);
-	entry->visible_sig = g_signal_connect(G_OBJECT(gmi), "notify::visible", G_CALLBACK(entry_visible_notify), entry);
+	g_signal_connect(G_OBJECT(gmi), "notify::sensitive", G_CALLBACK(entry_sensitive_notify), entry);
+	g_signal_connect(G_OBJECT(gmi), "notify::visible", G_CALLBACK(entry_visible_notify), entry);
 
 	g_object_set_data_full(G_OBJECT(gmi), ENTRY_DATA, entry, entry_object_free);