Merge lp:~charlesk/powerd/lp-1370791-add-brightness-property into lp:powerd

[Charles Kerr]

publish brightness changes on the bus.

Make an org.dbus.freedesktop.Property for brightness so that clients can watch to see when powerd adjusts brightness automatically.

Required for https://bugs.launchpad.net/ubuntu/+source/ubuntu-system-settings/+bug/1370791

[Alejandro J. Cura (alecu)]

Code looks good. Tested on mako with wily, works great.

review: Approve

[Ricardo Salveti (rsalveti)]

Code looks good, just waiting for the silo for proper testing.

review: Approve (code review)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:166
http://jenkins.qa.ubuntu.com/job/powerd-ci/178/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/powerd-vivid-armhf-ci/6
        deb: http://jenkins.qa.ubuntu.com/job/powerd-vivid-armhf-ci/6/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

=== modified file 'data/com.canonical.powerd.xml'
--- data/com.canonical.powerd.xml	2014-09-30 20:52:33 +0000
+++ data/com.canonical.powerd.xml	2015-05-20 19:42:06 +0000
@@ -3,6 +3,10 @@
   <interface name="com.canonical.powerd">
     <!-- Properties -->
 
+    <property name="brightness" type="i" access="readwrite">
+    </property>
+
+
     <!-- Functions -->
     <method name="requestSysState">
       <arg type="s" name="name" direction="in" />
 
=== modified file 'src/backlight.c'
--- src/backlight.c	2015-01-15 23:01:52 +0000
+++ src/backlight.c	2015-05-20 19:42:06 +0000
@@ -120,8 +120,10 @@
     /* Now set the final value (only care about error here as if
      * the last set works, we're good) */
     ret = set_brightness_hal(brightness);
-    if (!ret)
+    if (!ret) {
         current_brightness = brightness;
+        powerd_update_bus_brightness();
+    }
     else
         powerd_error("light_dev: failed to set brightness to %i", brightness);
 
 
=== modified file 'src/powerd-internal.h'
--- src/powerd-internal.h	2014-09-30 20:52:33 +0000
+++ src/powerd-internal.h	2015-05-20 19:42:06 +0000
@@ -114,6 +114,7 @@
 const gchar * state_to_string(int state);
 void powerd_sys_state_signal_emit(enum SysPowerStates state);
 void powerd_wakeup_signal_emit(void);
+void powerd_update_bus_brightness(void);
 void clear_sys_state_by_owner(const char *owner);
 gboolean powerd_suspend_active(void);
 
 
=== modified file 'src/powerd-object.c'
--- src/powerd-object.c	2015-05-07 20:14:20 +0000
+++ src/powerd-object.c	2015-05-20 19:42:06 +0000
@@ -192,6 +192,26 @@
     return TRUE;
 }
 
+/* update our brightness from the bus property */
+static void
+notify_brightness(ComCanonicalPowerd *skel,
+                  GParamSpec *pspec G_GNUC_UNUSED,
+                  gpointer user_data G_GNUC_UNUSED)
+{
+    powerd_set_user_brightness(
+        com_canonical_powerd_get_brightness(skel));
+}
+
+/* update the bus property from our brightness */
+void
+powerd_update_bus_brightness(void)
+{
+    if ((powerd_source != NULL) && (powerd_source->priv->skel != NULL)) {
+        com_canonical_powerd_set_brightness(
+            powerd_source->priv->skel,
+            powerd_get_brightness());
+    }
+}
 
 void
 powerd_bus_acquired_cb (GDBusConnection *connection,
@@ -248,6 +268,10 @@
     g_signal_connect(oskel, "handle-clear-wakeup",
         G_CALLBACK(handle_clear_wakeup), powerd_source);
 
+    powerd_update_bus_brightness();
+    g_signal_connect(oskel, "notify::brightness",
+        G_CALLBACK(notify_brightness), powerd_source);
+
     powerd_dbus_init_complete();
 }