Merge lp:~nick-dedekind/qmenumodel/lp1378941-disconnect-signals into lp:qmenumodel

[Nick Dedekind]

Disconnect QDBusActionGroup add/remove/stateChange signals when deleting object.

Disconnect QDBusActionGroup add/remove/stateChange signals when deleting object.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:113
http://jenkins.qa.ubuntu.com/job/qmenumodel-ci/53/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qmenumodel-utopic-amd64-ci/6
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qmenumodel-utopic-armhf-ci/6
        deb: http://jenkins.qa.ubuntu.com/job/qmenumodel-utopic-armhf-ci/6/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qmenumodel-ci/53/rebuild

review: Approve (continuous-integration)

[Charles Kerr (charlesk)]

review: Approve

[Charles Kerr (charlesk)]

review: Approve

[Michael Sheldon (michael-sheldon)]

Haven't been able to reproduce the crash since installing this branch, so that's a big +1 from me, thanks!

review: Approve

[Lars Karlitski (larsu)]

Yep, looks right. Thanks

review: Approve

=== modified file 'libqmenumodel/src/qdbusactiongroup.cpp'
--- libqmenumodel/src/qdbusactiongroup.cpp	2013-08-09 08:01:43 +0000
+++ libqmenumodel/src/qdbusactiongroup.cpp	2014-10-10 17:35:05 +0000
@@ -161,13 +161,7 @@
         return;
     }
 
-    if (m_actionGroup) {
-        g_signal_handler_disconnect(m_actionGroup, m_signalActionAddId);
-        g_signal_handler_disconnect(m_actionGroup, m_signalActionRemovedId);
-        g_signal_handler_disconnect(m_actionGroup, m_signalStateChangedId);
-        m_signalActionAddId = m_signalActionRemovedId = m_signalStateChangedId = 0;
-        clear();
-    }
+    clear();
 
     m_actionGroup = reinterpret_cast<GActionGroup*>(ag);
 
@@ -199,6 +193,13 @@
 /*! \internal */
 void QDBusActionGroup::clear()
 {
+    if (m_actionGroup) {
+        g_signal_handler_disconnect(m_actionGroup, m_signalActionAddId);
+        g_signal_handler_disconnect(m_actionGroup, m_signalActionRemovedId);
+        g_signal_handler_disconnect(m_actionGroup, m_signalStateChangedId);
+        m_signalActionAddId = m_signalActionRemovedId = m_signalStateChangedId = 0;
+    }
+
     Q_FOREACH(QStateAction *act, this->findChildren<QStateAction*>()) {
         Q_EMIT actionVanish(act->name());
     }