Merge lp:~3v1n0/unity-settings-daemon/keep-cached-kbd-backlight-updated into lp:unity-settings-daemon

[Marco Trevisan (Treviño)]

PowerManager: connect to keyboard BrightnessChanged signal to update the cached current value properly

[lp:~3v1n0/unity-settings-daemon/keep-cached-kbd-backlight-updated]

4135. By Marco Trevisan (Treviño) on 2016-05-13

PowerManager: return proper value on Toggle method call

4136. By Marco Trevisan (Treviño) on 2016-05-30

GsdPowerManager: implement "Toggle" as upstream

[Sebastien Bacher (seb128)]

thanks

review: Approve

[Sebastien Bacher (seb128)]

seems like that created bug #1592816, the upower_kbd_toggle return type changed and we need changes from https://git.gnome.org/browse/gnome-settings-daemon/commit/?id=5614e2c7a275a092e1fcf43450d7f0c5730c14bd

"- ret = upower_kbd_toggle (manager, &error);
+ value = upower_kbd_toggle (manager, &error);
+ ret = (value >= 0);"

=== modified file 'plugins/power/gsd-power-manager.c'
--- plugins/power/gsd-power-manager.c	2016-05-30 19:19:47 +0000
+++ plugins/power/gsd-power-manager.c	2016-05-30 19:19:47 +0000
@@ -1956,11 +1956,12 @@
         return TRUE;
 }
 
-static gboolean
+static int
 upower_kbd_toggle (GsdPowerManager *manager,
                    GError **error)
 {
         gboolean ret;
+        int value = -1;
 
         if (manager->priv->kbd_brightness_old >= 0) {
                 g_debug ("keyboard toggle off");
@@ -1970,6 +1971,7 @@
                 if (ret) {
                         /* succeeded, set to -1 since now no old value */
                         manager->priv->kbd_brightness_old = -1;
+                        value = 0;
                 }
         } else {
                 g_debug ("keyboard toggle on");
@@ -1979,10 +1981,14 @@
                 if (!ret) {
                         /* failed, reset back to -1 */
                         manager->priv->kbd_brightness_old = -1;
+                } else {
+                        value = 0;
                 }
         }
 
-        return ret;
+        if (ret)
+                return value;
+        return -1;
 }
 
 static gboolean
@@ -2842,6 +2848,20 @@
 }
 
 static void
+upower_kbd_signal_cb (GDBusProxy *proxy,
+                      const gchar *sender_name,
+                      const gchar *signal_name,
+                      GVariant *parameters,
+                      gpointer user_data)
+{
+        GsdPowerManager *manager = GSD_POWER_MANAGER (user_data);
+
+        if (g_strcmp0 (signal_name, "BrightnessChanged") == 0) {
+                g_variant_get (parameters, "(i)", &manager->priv->kbd_brightness_now);
+        }
+}
+
+static void
 power_keyboard_proxy_ready_cb (GObject             *source_object,
                                GAsyncResult        *res,
                                gpointer             user_data)
@@ -2859,6 +2879,9 @@
                 goto out;
         }
 
+        g_signal_connect (manager->priv->upower_kdb_proxy, "g-signal",
+                          G_CALLBACK (upower_kbd_signal_cb), manager);
+
         k_now = g_dbus_proxy_call_sync (manager->priv->upower_kdb_proxy,
                                         "GetBrightness",
                                         NULL,
@@ -3550,7 +3573,9 @@
                 ret = upower_kbd_set_brightness (manager, value, &error);
 
         } else if (g_strcmp0 (method_name, "Toggle") == 0) {
-                ret = upower_kbd_toggle (manager, &error);
+                value = upower_kbd_toggle (manager, &error);
+                ret = (value >= 0);
+
         } else {
                 g_assert_not_reached ();
         }