Merge lp:~mterry/unity8/lockscreen-unresponsive into lp:unity8

[Michael Terry]

Fix the lockscreen becoming unresponsive after testing an app on the device from QtCreator.

Using the hideGreeter dbus call got unity8 in a state where the greeter would try to call a method on an object that didn't exist at the time. Which meant it early-exited from a method before the greeter got re-enabled.

Fix the lockscreen becoming unresponsive after testing an app on the device from QtCreator.

Using the hideGreeter dbus call got unity8 in a state where the greeter would try to call a method on an object that didn't exist at the time. Which meant it early-exited from a method before the greeter got re-enabled.

== Checklist ==

 * Are there any related MPs required for this MP to build/function as expected? Please list.
 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?
 NA

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

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1752
http://jenkins.qa.ubuntu.com/job/unity8-ci/5623/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2459/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/786
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/788
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/788
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2138/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2457
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2457/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/19936

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

review: Needs Fixing (continuous-integration)

[Daniel d'Andrada (dandrader)]

* Did you perform an exploratory manual test run of the code change and any related functionality?
No, but it's a no-brainer.

* Did CI run pass? If not, please explain why.
Autopilot is broken as usual.

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

review: Approve

[Daniel d'Andrada (dandrader)]

review: Approve (codewise)

[Albert Astals Cid (aacid)]

Talking with saviq he thought that the two loader.item.notifyAuthentication calls were the same, i did too, because they're very long :D, which would have made sense to unify then, but otherwise it's ok, top approving.

=== modified file 'qml/Greeter/Greeter.qml'
--- qml/Greeter/Greeter.qml	2015-03-18 10:17:28 +0000
+++ qml/Greeter/Greeter.qml	2015-04-27 13:55:32 +0000
@@ -141,8 +141,10 @@
             enabled = false;
             if (LightDM.Greeter.startSessionSync()) {
                 sessionStarted();
-                loader.item.notifyAuthenticationSucceeded();
-            } else {
+                if (loader.item) {
+                    loader.item.notifyAuthenticationSucceeded();
+                }
+            } else if (loader.item) {
                 loader.item.notifyAuthenticationFailed();
             }
             enabled = true;