Merge lp:~mterry/powerd/consistent-state into lp:powerd

[Michael Terry]

Emit display state changed signals any time state changes, not just when requested state changes.

Emit display state changed signals any time state changes, not just when requested state changes.

Without this, we don't emit a changed signal on power button presses if we have an existing display-on request. Which was stopping autopilot from being able to lock unity8 by simulating a power button press (jenkins keeps screen from timing out with powerd-cli, unity8 listens for the display state changed signal to lock).

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:125
http://jenkins.qa.ubuntu.com/job/powerd-ci/147/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/powerd-trusty-armhf-ci/17
        deb: http://jenkins.qa.ubuntu.com/job/powerd-trusty-armhf-ci/17/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Oliver Grawert (ogra)]

i see no ill effects with that patch applied, approving

review: Approve

[Ricardo Salveti (rsalveti)]

Code if fine, and works as expected, thanks!

review: Approve

=== modified file 'src/display-request.c'
--- src/display-request.c	2013-08-12 04:45:17 +0000
+++ src/display-request.c	2014-04-14 21:20:04 +0000
@@ -78,7 +78,6 @@
                  new_state.state, new_state.flags);
     internal_state = new_state;
     powerd_set_display_state(&internal_state);
-    powerd_display_state_signal_emit(&internal_state);
 }
 
 static void __add_request(struct powerd_display_request *req)

=== modified file 'src/display.c'
--- src/display.c	2014-03-28 21:30:25 +0000
+++ src/display.c	2014-04-14 21:20:04 +0000
@@ -270,6 +270,8 @@
     }
 
     actual_screen_state = applied_state;
+
+    powerd_display_state_signal_emit(actual_screen_state, req->flags);
 }
 
 static void update_flags(guint32 flags)

=== modified file 'src/powerd-internal.h'
--- src/powerd-internal.h	2014-03-26 12:36:15 +0000
+++ src/powerd-internal.h	2014-04-14 21:20:04 +0000
@@ -140,7 +140,8 @@
 enum SysPowerStates current_system_power_state(void);
 const gchar * state_to_string(int state);
 void powerd_sys_state_signal_emit(enum SysPowerStates state);
-void powerd_display_state_signal_emit(struct powerd_display_request *req);
+void powerd_display_state_signal_emit(enum powerd_display_state state,
+                                      guint32 flags);
 void clear_sys_state_by_owner(const char *owner);
 gboolean powerd_suspend_active(void);
 

=== modified file 'src/powerd-object.c'
--- src/powerd-object.c	2014-03-26 12:36:15 +0000
+++ src/powerd-object.c	2014-04-14 21:20:04 +0000
@@ -234,7 +234,8 @@
 }
 
 void
-powerd_display_state_signal_emit(struct powerd_display_request *req)
+powerd_display_state_signal_emit(enum powerd_display_state state,
+                                 guint32 flags)
 {
     GError *error = NULL;
 
@@ -243,14 +244,14 @@
         return;
 
     powerd_debug("Emitting signal for display state change: state=%d flags=0x%08x",
-                 req->state, req->flags);
+                 state, flags);
     g_dbus_connection_emit_signal(
             POWERD_SOURCE_GET_PRIVATE(powerd_source)->system_bus,
             NULL, /* destination */
             "/com/canonical/powerd",
             "com.canonical.powerd",
             "DisplayPowerStateChange",
-            g_variant_new("(iu)", req->state, req->flags),
+            g_variant_new("(iu)", state, flags),
             &error);
     if (error) {
         powerd_warn("Unable to signal a state change update: %s", error->message);