Merge lp:~ricmm/powerd/suspend-if-mir-alive into lp:powerd

[Ricardo Mendoza]

Under Mir, only suspend if Mir is still alive; this is to prevent the GPU state and the display server expectations getting out of sync when starting up.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:100
http://jenkins.qa.ubuntu.com/job/powerd-ci/129/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/powerd-saucy-armhf-ci/83
        deb: http://jenkins.qa.ubuntu.com/job/powerd-saucy-armhf-ci/83/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/powerd-ci/129/rebuild

review: Approve (continuous-integration)

[Didier Roche-Tolomelli (didrocks)]

asac tested and approve with his blood

review: Approve

=== modified file 'src/display.c'
--- src/display.c	2013-09-25 21:29:09 +0000
+++ src/display.c	2013-10-09 16:15:06 +0000
@@ -107,7 +107,7 @@
     return (flags & AB_ENABLED_MASK) == AB_ENABLED;
 }
 
-void display_set_power_mode(int display, char *power_mode)
+gboolean display_set_power_mode(int display, char *power_mode)
 {
     GError *error = NULL;
     GDBusProxy *unity_proxy = NULL;
@@ -132,7 +132,7 @@
         if (error != NULL) {
             powerd_warn("could not connect to Unity: %s", error->message);
             g_error_free(error);
-            return;
+            return FALSE;
         }
 
         GVariant *ret = g_dbus_proxy_call_sync(unity_proxy,
@@ -146,10 +146,14 @@
         if (ret == NULL) {
             powerd_warn("screen power setting failed: %s", error->message);
             g_error_free(error);
+            g_object_unref(unity_proxy);
+            return FALSE;
         }
 
         g_object_unref(unity_proxy);
     }
+
+    return TRUE;
 }
 
 static void turn_on_display(gboolean autobrightness) {
@@ -223,7 +227,10 @@
         if (using_ab)
             powerd_autobrightness_disable();
         powerd_set_brightness(0);
-        display_set_power_mode(0, "off");
+        if (!display_set_power_mode(0, "off")) {
+            powerd_warn("failed to set display power mode, not clearing state");
+            return;
+        }
 
         powerd_debug("Releasing internal active state request");
         ret = clear_sys_state_internal(internal_request_cookie);

=== modified file 'src/powerd-internal.h'
--- src/powerd-internal.h	2013-09-24 13:15:40 +0000
+++ src/powerd-internal.h	2013-10-09 16:15:06 +0000
@@ -74,7 +74,7 @@
 /* Display functions */
 void powerd_brightness_set_value(gint value);
 gboolean powerd_display_enabled(void);
-void display_set_power_mode(int display, char *powerd_mode);
+gboolean display_set_power_mode(int display, char *powerd_mode);
 void powerd_set_display_state(struct powerd_display_request *req);
 int powerd_display_init(void);
 void powerd_proximity_event(gboolean near);