Merge lp:~townsend/unity/fix-resume-signal into lp:unity

[Christopher Townsend]

Change the signal for detecting resuming from Suspend from UPower (which is unreliable) to logind.

Change the signal for detecting resuming from Suspend from UPower (which is unreliable) to logind.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3732
http://jenkins.qa.ubuntu.com/job/unity-ci/810/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-amd64-ci/346
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-armhf-ci/342
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-i386-ci/344

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

review: Approve (continuous-integration)

[Brandon Schaefer (brandontschaefer)]

Nice, LGTM

review: Approve

=== modified file 'unity-shared/UScreen.cpp'
--- unity-shared/UScreen.cpp	2014-03-06 02:26:45 +0000
+++ unity-shared/UScreen.cpp	2014-03-19 13:29:43 +0000
@@ -28,14 +28,19 @@
 UScreen::UScreen()
   : primary_(0)
   , screen_(gdk_screen_get_default(), glib::AddRef())
-  , proxy_("org.freedesktop.UPower",
-           "/org/freedesktop/UPower",
-           "org.freedesktop.UPower",
+  , proxy_("org.freedesktop.login1",
+           "/org/freedesktop/login1",
+           "org.freedesktop.login1.Manager",
            G_BUS_TYPE_SYSTEM)
 {
   size_changed_signal_.Connect(screen_, "size-changed", sigc::mem_fun(this, &UScreen::Changed));
   monitors_changed_signal_.Connect(screen_, "monitors-changed", sigc::mem_fun(this, &UScreen::Changed));
-  proxy_.Connect("Resuming", [this] (GVariant* data) { resuming.emit(); });
+  proxy_.Connect("PrepareForSleep", [this] (GVariant* data) { 
+    bool val;
+    g_variant_get(data, "(b)", &val);
+    if (!val)
+      resuming.emit(); 
+  });
 
   Refresh();
 }