Merge lp:~saviq/unity/phablet.raring-backport-726 into lp:unity/phablet.raring

[Michał Sawicz]

cherry-pick greeter lock fix (lp:unity/phablet rev. 726)

The greeter would freeze up after 13 or so phone unlocks. This is an issue in the InputFilterArea in qtubuntu, but this workaround makes it go away.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:723
http://jenkins.qa.ubuntu.com/job/unity-phablet.raring-ci/1/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/unity-phablet-qmluitests/1153
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet.raring-raring-armhf-ci/1
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet.raring-raring-armhf-ci/1/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet.raring-raring-i386-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1828

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-phablet.raring-ci/1/rebuild

review: Approve (continuous-integration)

[Sergio Schvezov (sergiusens)]

Seems to be good... going to ask for one more person to check

review: Approve

[Ricardo Salveti (rsalveti)]

Working fine with mako.

review: Approve

=== modified file 'Shell.qml'
--- Shell.qml	2013-05-31 22:48:16 +0000
+++ Shell.qml	2013-06-03 16:26:57 +0000
@@ -393,11 +393,11 @@
             var bgPath = greeter.model.data(uid, LightDM.UserRoles.BackgroundPathRole)
             shell.background = bgPath ? bgPath : default_background
         }
+    }
 
-        InputFilterArea {
-            anchors.fill: parent
-            blockInput: greeter.shown
-        }
+    InputFilterArea {
+        anchors.fill: parent
+        blockInput: greeter.shown
     }
 
     Revealer {

=== modified file 'debian/changelog'
--- debian/changelog	2013-05-31 22:31:27 +0000
+++ debian/changelog	2013-06-03 16:26:57 +0000
@@ -1,3 +1,9 @@
+qml-phone-shell (1.80.1) raring; urgency=low
+
+  * cherry-pick greeter lock fix
+
+ -- Michał Sawicz <[e-mail]>  Mon, 03 Jun 2013 18:14:41 +0200
+
 qml-phone-shell (1.80) raring; urgency=low
 
   * Focus/unfocus apps on lock/unlock to make sure keyboard is hidden.