Merge lp:~townsend/unity8/fix-lp1360316 into lp:unity8

[Christopher Townsend]

Allow for proper logout session management. This uses the EndSession() Upstart DBus method on the current session bus.

For reference, I discussed the implementation of this with Martin Pitt.

* Are there any related MPs required for this MP to build/function as expected?
No

* Did you perform an exploratory manual test run of your code change and any related functionality?
Yes

* Did you make sure that your branch does not contain spurious tags?
Yes

* If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
N/A

 * If you changed the UI, has there been a design review?
N/A

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1570
http://jenkins.qa.ubuntu.com/job/unity8-ci/5191/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1006/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/355/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/356/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/356/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1004/console

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

review: Needs Fixing (continuous-integration)

[lp:~townsend/unity8/fix-lp1360316]

1571. By Christopher Townsend on 2015-01-27

Fix some whitespace issues Jenkins is complaining about.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1571
http://jenkins.qa.ubuntu.com/job/unity8-ci/5194/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1018/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/358/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/359/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/359/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1016/console

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

review: Needs Fixing (continuous-integration)

[lp:~townsend/unity8/fix-lp1360316]

1572. By Christopher Townsend on 2015-01-27

Fixed another whitespace issue.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1572
http://jenkins.qa.ubuntu.com/job/unity8-ci/5197/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1023/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/361/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/362
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/362
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/903/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1021
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1021/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17511

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

review: Needs Fixing (continuous-integration)

[Sebastien Bacher (seb128)]

I've tested that branch and it works fine on vivid

[Albert Astals Cid (aacid)]

 * Did you perform an exploratory manual test run of the code change and any related functionality?
Yes

 * Did CI run pass?
Known broken stuff

 * Did you make sure that the branch does not contain spurious tags?
Yes

review: Approve

=== modified file 'plugins/Unity/Session/dbusunitysessionservice.cpp'
--- plugins/Unity/Session/dbusunitysessionservice.cpp	2014-10-09 15:00:32 +0000
+++ plugins/Unity/Session/dbusunitysessionservice.cpp	2015-01-27 15:03:56 +0000
@@ -35,6 +35,17 @@
   Q_EMIT logoutReady();
 }
 
+void DBusUnitySessionService::EndSession()
+{
+  QDBusConnection connection = QDBusConnection::sessionBus();
+  QDBusInterface iface1 ("com.ubuntu.Upstart",
+                         "/com/ubuntu/Upstart",
+                         "com.ubuntu.Upstart0_6",
+                         connection);
+
+  iface1.call("EndSession");
+}
+
 void DBusUnitySessionService::RequestLogout()
 {
   Q_EMIT logoutRequested(false);

=== modified file 'plugins/Unity/Session/dbusunitysessionservice.h'
--- plugins/Unity/Session/dbusunitysessionservice.h	2014-12-11 13:41:26 +0000
+++ plugins/Unity/Session/dbusunitysessionservice.h	2015-01-27 15:03:56 +0000
@@ -39,6 +39,7 @@
     Q_INVOKABLE void logout() { Logout(); }
     Q_INVOKABLE void reboot() { Reboot(); }
     Q_INVOKABLE void shutdown() { Shutdown(); }
+    Q_INVOKABLE void endSession() { EndSession(); }
 
 Q_SIGNALS:
     /**
@@ -139,6 +140,13 @@
      */
     Q_SCRIPTABLE void RequestShutdown();
 
+    /**
+     * Issue an EndSession request.
+     *
+     * This method calls the EndSession() Upstart DBus method on the
+     * current DBus session bus.
+     */
+    Q_SCRIPTABLE void EndSession();
 };
 
 #endif // DBUSUNITYSESSIONSERVICE_H

=== modified file 'qml/Components/Dialogs.qml'
--- qml/Components/Dialogs.qml	2014-12-08 13:39:01 +0000
+++ qml/Components/Dialogs.qml	2015-01-27 15:03:56 +0000
@@ -211,6 +211,7 @@
         onLogoutReady: {
             root.closeAllApps();
             Qt.quit();
+            unitySessionService.endSession();
         }
     }