Merge lp:~mterry/unity8/show-greeter-dbus into lp:unity8

[Michael Terry]

Allow the session to bring up the greeter/lockscreen over DBus. The emergency dialer will need this support in order to cancel bringing it up.

Allow the session to bring up the greeter/lockscreen over DBus. The emergency dialer will need this support in order to cancel bringing it up.

== Checklist ==

 * Are there any related MPs required for this MP to build/function as expected? Please list.
 - Yes, lp:~mterry/unity8/is-active, which this MP is based on

 * 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?
 - NA

 * If you changed the UI, has there been a design review?
 -NA

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:980
http://jenkins.qa.ubuntu.com/job/unity8-ci/3264/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/1342
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/268
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/358
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/358
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/358/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/358
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/1653
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2260
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2260/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/9009

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

review: Needs Fixing (continuous-integration)

[lp:~mterry/unity8/show-greeter-dbus]

981. By Michael Terry on 2014-07-11

Merge from is-active

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:981
http://jenkins.qa.ubuntu.com/job/unity8-ci/3411/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/1879
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/415
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/505
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/505
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/505/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/505
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/2135
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2976
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2976/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/9711

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

review: Approve (continuous-integration)

[Michael Zanetti (mzanetti)]

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

Yep, working fine

 * Did CI run pass? If not, please explain why.

yes

review: Approve

=== modified file 'plugins/LightDM/DBusGreeter.cpp'
--- plugins/LightDM/DBusGreeter.cpp	2014-07-11 15:45:05 +0000
+++ plugins/LightDM/DBusGreeter.cpp	2014-07-11 15:45:05 +0000
@@ -34,6 +34,11 @@
     return m_greeter->isActive();
 }
 
+void DBusGreeter::ShowGreeter()
+{
+    return Q_EMIT m_greeter->showGreeter();
+}
+
 void DBusGreeter::isActiveChangedHandler()
 {
     notifyPropertyChanged("IsActive", isActive());
 
=== modified file 'plugins/LightDM/DBusGreeter.h'
--- plugins/LightDM/DBusGreeter.h	2014-07-11 15:45:05 +0000
+++ plugins/LightDM/DBusGreeter.h	2014-07-11 15:45:05 +0000
@@ -37,6 +37,7 @@
     explicit DBusGreeter(Greeter *greeter, const QDBusConnection &connection, const QString &path);
 
     bool isActive() const;
+    Q_SCRIPTABLE void ShowGreeter(); // temporary, until we split the greeter again
 
 Q_SIGNALS:
     void isActiveChanged();
 
=== modified file 'plugins/LightDM/Greeter.h'
--- plugins/LightDM/Greeter.h	2014-07-11 15:45:05 +0000
+++ plugins/LightDM/Greeter.h	2014-07-11 15:45:05 +0000
@@ -60,6 +60,7 @@
     void authenticationUserChanged(const QString &user);
     void isActiveChanged();
     void promptlessChanged();
+    void showGreeter();
 
     // This signal is emitted by external agents like indicators, and the UI
     // should switch to this user if possible.
 
=== modified file 'qml/Shell.qml'
--- qml/Shell.qml	2014-07-11 15:45:05 +0000
+++ qml/Shell.qml	2014-07-11 15:45:05 +0000
@@ -348,6 +348,8 @@
     Connections {
         target: LightDM.Greeter
 
+        onShowGreeter: greeter.show()
+
         onShowPrompt: {
             if (LightDM.Users.count == 1) {
                 // TODO: There's no better way for now to determine if its a PIN or a passphrase.
@@ -418,6 +420,9 @@
             onShownChanged: {
                 if (shown) {
                     lockscreen.reset();
+                    if (!LightDM.Greeter.promptless) {
+                       lockscreen.show();
+                    }
                     // If there is only one user, we start authenticating with that one here.
                     // If there are more users, the Greeter will handle that
                     if (LightDM.Users.count == 1) {
 
=== modified file 'tests/plugins/LightDM/dbus.cpp'
--- tests/plugins/LightDM/dbus.cpp	2014-07-11 15:45:05 +0000
+++ tests/plugins/LightDM/dbus.cpp	2014-07-11 15:45:05 +0000
@@ -187,6 +187,13 @@
         QVERIFY(arguments.at(1).toMap()["IsActive"].toBool());
     }
 
+    void testShowGreeter()
+    {
+        // Just confirm the call exists and doesn't fail
+        QDBusReply<void> reply = dbusMain->call("ShowGreeter");
+        QVERIFY(reply.isValid());
+    }
+
 private:
     QQuickView *view;
     Greeter *greeter;
 
=== modified file 'tests/qmltests/tst_Shell.qml'
--- tests/qmltests/tst_Shell.qml	2014-07-05 22:26:59 +0000
+++ tests/qmltests/tst_Shell.qml	2014-07-11 15:45:05 +0000
@@ -20,6 +20,7 @@
 import QtQuick 2.0
 import QtTest 1.0
 import GSettings 1.0
+import LightDM 0.1 as LightDM
 import Unity.Application 0.1
 import Unity.Test 0.1 as UT
 import Powerd 0.1
@@ -520,5 +521,12 @@
             tryCompare(greeter, "showProgress", 0)
             waitUntilApplicationWindowIsFullyVisible()
         }
+
+        function test_showGreeterDBusCall() {
+            var greeter = findChild(shell, "greeter")
+            tryCompare(greeter, "showProgress", 0)
+            LightDM.Greeter.showGreeter()
+            tryCompare(greeter, "showProgress", 1)
+        }
     }
 }