Merge lp:~cyphermox/mtp/fix-1389223 into lp:mtp

[Mathieu Trudel-Lapierre]

Wait for UnityGreeter before starting mtp-server.

Wait for UnityGreeter before starting mtp-server.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:55
http://jenkins.qa.ubuntu.com/job/mtp-ci/28/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mtp-utopic-amd64-ci/13
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mtp-utopic-armhf-ci/13
        deb: http://jenkins.qa.ubuntu.com/job/mtp-utopic-armhf-ci/13/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mtp-utopic-i386-ci/13

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

review: Approve (continuous-integration)

[lp:~cyphermox/mtp/fix-1389223]

55. By Mathieu Trudel-Lapierre on 2014-11-04

Wait for unity8 to be started; we need it for the UnityGreeter, to be aware
of the screen lock state.

[Ricardo Salveti (rsalveti)]

LGTM, works as expected.

review: Approve

=== modified file 'debian/mtp-server.conf'
--- debian/mtp-server.conf	2014-08-14 16:33:19 +0000
+++ debian/mtp-server.conf	2014-11-04 17:28:47 +0000
@@ -1,10 +1,18 @@
 description "MTP protocol server"
 
-start on :sys:android-mtp-on or :sys:android-usb-connected
+start on (:sys:android-mtp-on or :sys:android-usb-connected) and (started unity8)
 stop on desktop-end or :sys:android-mtp-off
 
 pre-start script
     [ "$USER" != "lightdm" ] || { stop; exit 0; }
+
+    # Fix for bug LP: #1389223: UnityGreeter isn't available immediately
+    if ! dbus-send --session --print-reply \
+            --dest=com.canonical.UnityGreeter \
+            / org.freedesktop.DBus.Introspectable.Introspect 2>&1 | \
+                grep -qc IsActive; then
+        sleep 10
+    fi
 end script
 
 env GOOGLE_LOGTOSTDERR=1
@@ -12,3 +20,4 @@
 respawn
 
 exec /usr/bin/mtp-server
+