Merge lp:~3v1n0/unity-settings-daemon/kbd-toggle-ret-value-fix into lp:unity-settings-daemon

[Marco Trevisan (Treviño)]

GsdPowerManager: use proper return value for upower_kbd_toggle wherever we use it

[Sebastien Bacher (seb128)]

thanks, the first chunck is unrelated to the change and just cleanups but it's ok for this time!

review: Approve

=== modified file 'plugins/power/gsd-power-manager.c'
--- plugins/power/gsd-power-manager.c	2016-06-13 11:30:13 +0000
+++ plugins/power/gsd-power-manager.c	2016-06-15 15:44:48 +0000
@@ -905,8 +905,6 @@
         guint i;
         GPtrArray *array = NULL;
         UpDevice *device;
-        gboolean ret;
-        GError *error = NULL;
 
         engine_recalculate_state (manager);
 
@@ -2408,8 +2406,7 @@
                 /* only toggle keyboard if present and not already toggled */
                 if (manager->priv->upower_kdb_proxy &&
                     manager->priv->kbd_brightness_old == -1) {
-                        ret = upower_kbd_toggle (manager, &error);
-                        if (!ret) {
+                        if (upower_kbd_toggle (manager, &error) < 0) {
                                 g_warning ("failed to turn the kbd backlight off: %s",
                                            error->message);
                                 g_error_free (error);
@@ -2451,8 +2448,7 @@
                 /* only toggle keyboard if present and already toggled off */
                 if (manager->priv->upower_kdb_proxy &&
                     manager->priv->kbd_brightness_old != -1) {
-                        ret = upower_kbd_toggle (manager, &error);
-                        if (!ret) {
+                        if (upower_kbd_toggle (manager, &error) < 0) {
                                 g_warning ("failed to turn the kbd backlight on: %s",
                                            error->message);
                                 g_clear_error (&error);