Merge lp:~vorlon/unity8/lp.1235649 into lp:unity8

[Steve Langasek]

Don't keep a long-lived connection open to upstart when we only use it for
two events, one at load time and one at unload time.

Fix handling of the upstart dbus connection in the indicator plugin: we do
not want to hold a socket open to upstart for the life of the process when
we only use it twice.

[Thomas Voß (thomas-voss)]

LGTM.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:434
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~vorlon/unity8/lp.1235649/+merge/190443/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/unity8-ci/1354/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/4909
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/2789
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/2220
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-amd64-ci/377
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1354
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1354/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/1353
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-saucy/1087
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/784
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/784/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2791
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2791/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/2323
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/2356

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/unity8-ci/1354/rebuild

review: Needs Fixing (continuous-integration)

=== modified file 'plugins/Unity/Indicators/indicatorsmanager.cpp'
--- plugins/Unity/Indicators/indicatorsmanager.cpp	2013-08-30 08:17:10 +0000
+++ plugins/Unity/Indicators/indicatorsmanager.cpp	2013-10-10 18:05:08 +0000
@@ -47,34 +47,13 @@
 IndicatorsManager::IndicatorsManager(QObject* parent)
     : QObject(parent)
     , m_loaded(false)
-    , m_upstart(NULL)
 {
-    auto upstartsession = qgetenv("UPSTART_SESSION");
-    if (!upstartsession.isNull()) {
-        DBusConnection * conn = NULL;
-        conn = dbus_connection_open(upstartsession.constData(), NULL);
-        if (conn != NULL) {
-            m_upstart = nih_dbus_proxy_new(NULL, conn,
-                NULL,
-                DBUS_PATH_UPSTART,
-                NULL, NULL);
-            dbus_connection_unref(conn);
-        }
-    }
-
-    if (m_upstart != NULL) {
-        m_upstart->auto_start = FALSE;
-    }
 }
 
 IndicatorsManager::~IndicatorsManager()
 {
     unload();
 
-    if (m_upstart != NULL) {
-        nih_unref(m_upstart, NULL);
-        m_upstart = NULL;
-    }
 }
 
 void IndicatorsManager::load()
@@ -235,17 +214,34 @@
         m_loaded = loaded;
         Q_EMIT loadedChanged(m_loaded);
 
-        if (m_upstart != NULL) {
+        auto upstartsession = qgetenv("UPSTART_SESSION");
+        NihDBusProxy * upstart = NULL;
+
+        if (!upstartsession.isNull()) {
+            DBusConnection * conn = NULL;
+            conn = dbus_connection_open(upstartsession.constData(), NULL);
+            if (conn != NULL) {
+                upstart = nih_dbus_proxy_new(NULL, conn,
+                    NULL,
+                    DBUS_PATH_UPSTART,
+                    NULL, NULL);
+                dbus_connection_unref(conn);
+            }
+        }
+
+        if (upstart != NULL) {
             int event_sent = 0;
             if (m_loaded) {
-                event_sent = upstart_emit_event_sync(NULL, m_upstart, "indicator-services-start", NULL, 0);
+                event_sent = upstart_emit_event_sync(NULL, upstart, "indicator-services-start", NULL, 0);
             } else {
-                event_sent = upstart_emit_event_sync(NULL, m_upstart, "indicator-services-end", NULL, 0);
+                event_sent = upstart_emit_event_sync(NULL, upstart, "indicator-services-end", NULL, 0);
             }
 
             if (event_sent != 0) {
                 qWarning() << "Unable to send indicator event to Upstart";
             }
+            nih_unref(upstart, NULL);
+            upstart = NULL;
         }
     }
 }

=== modified file 'plugins/Unity/Indicators/indicatorsmanager.h'
--- plugins/Unity/Indicators/indicatorsmanager.h	2013-08-07 16:10:35 +0000
+++ plugins/Unity/Indicators/indicatorsmanager.h	2013-10-10 18:05:08 +0000
@@ -71,7 +71,6 @@
     QHash<QString, IndicatorData*> m_indicatorsData;
     QSharedPointer<QFileSystemWatcher> m_fsWatcher;
     bool m_loaded;
-    NihDBusProxy * m_upstart;
 };
 
 #endif // INDICATORS_MANAGER_H