Merge lp:~charlesk/indicator-applet/lp-1284840 into lp:indicator-applet

[Charles Kerr]

Use the correct signal_spec syntax when calling g_object_disconnect().

Use the correct signal_spec syntax when calling g_object_disconnect().

Prior to this patch, we're using the same syntax as g_object_connect(), which is wrong.

The docs say this about _disconnect():

> The signal specs expected by this function have the form "any_signal", which means to disconnect any signal with matching callback and data, or "any_signal::signal_name", which only disconnects the signal named "signal_name".

[PS Jenkins bot (ps-jenkins)]

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

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-applet-ci/11/rebuild

review: Approve (continuous-integration)

[Ted Gould (ted)]

They docs say "any_signal" but looking at the code "any-signal" should work as well.

review: Approve

=== modified file 'src/applet-main.c'
--- src/applet-main.c	2013-09-19 21:56:33 +0000
+++ src/applet-main.c	2014-02-25 21:16:04 +0000
@@ -498,16 +498,16 @@
   /* disconnect the callbacks */
   if (G_IS_OBJECT (entry->label)) {
     g_object_disconnect (entry->label,
-                         "signal::show", G_CALLBACK(something_shown), menuitem,
-                         "signal::hide", G_CALLBACK(something_hidden), menuitem,
-                         "signal::notify::sensitive", G_CALLBACK(sensitive_cb), menuitem,
+                         "any-signal", G_CALLBACK(something_shown), menuitem,
+                         "any-signal", G_CALLBACK(something_hidden), menuitem,
+                         "any-signal", G_CALLBACK(sensitive_cb), menuitem,
                          NULL);
   }
   if (G_IS_OBJECT (entry->image)) {
     g_object_disconnect (entry->image,
-                         "signal::show", G_CALLBACK(something_shown), menuitem,
-                         "signal::hide", G_CALLBACK(something_hidden), menuitem,
-                         "signal::notify::sensitive", G_CALLBACK(sensitive_cb), menuitem,
+                         "any-signal", G_CALLBACK(something_shown), menuitem,
+                         "any-signal", G_CALLBACK(something_hidden), menuitem,
+                         "any-signal", G_CALLBACK(sensitive_cb), menuitem,
                          NULL);
   }