Merge lp:~rsalveti/powerd/export_dim_brightness_value into lp:powerd

[Ricardo Salveti]

Also exporting dim brightness value via getBrightnessParams

Also exporting dim brightness value via getBrightnessParams

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

=== modified file 'cli/powerd-cli.c'
--- cli/powerd-cli.c	2014-03-27 21:00:53 +0000
+++ cli/powerd-cli.c	2014-04-23 02:22:08 +0000
@@ -916,7 +916,7 @@
 }
 
 static gboolean
-getBrightnessParams(int *min, int *max, int *dflt, gboolean *ab_supported)
+getBrightnessParams(int *dim, int *min, int *max, int *dflt, gboolean *ab_supported)
 {
     GVariant *ret = NULL;
     GError *error = NULL;
@@ -932,7 +932,7 @@
         return FALSE;
     }
 
-    g_variant_get(ret, "((iiib))", min, max, dflt, ab_supported);
+    g_variant_get(ret, "((iiiib))", dim, min, max, dflt, ab_supported);
     g_variant_unref(ret);
     return TRUE;
 }
@@ -966,7 +966,7 @@
             "exit, causing the request to be dropped.\n");
     printf("autobrightness <enable|disable> - enable or disable autobrightness.\n");
     printf("brightness <brightness> - set user screen brightness.\n");
-    printf("brightness-params - get brightness parameters (min, max, etc.)\n");
+    printf("brightness-params - get brightness parameters (dim, min, max, etc.)\n");
     printf("clear-sys <cookie> - clear a System state request given a cookie.\n");
     printf("clear-disp <cookie> - clear a Display state request given a cookie.\n");
     printf("client-test - test powerd registration / ack API.\n");
@@ -1191,13 +1191,14 @@
         }
         setUserAutobrightness(enable);
     } else if (!strcmp(argv[1], "brightness-params")) {
-        int min, max, dflt, ab;
-        if (getBrightnessParams(&min, &max, &dflt, &ab)) {
-            printf("Minimum Brightness: %d\n"
+        int dim, min, max, dflt, ab;
+        if (getBrightnessParams(&dim, &min, &max, &dflt, &ab)) {
+            printf("Dim Brightness: %d\n"
+                   "Minimum Brightness: %d\n"
                    "Maximum Brightness: %d\n"
                    "Default Brightness: %d\n"
                    "Autobrightness:     %ssupported\n",
-                   min, max, dflt, ab ? "" : "not ");
+                   dim, min, max, dflt, ab ? "" : "not ");
         }
     } else if (!strcmp(argv[1], "brightness")) {
         long brightness;

=== modified file 'data/com.canonical.powerd.xml'
--- data/com.canonical.powerd.xml	2014-01-14 03:14:22 +0000
+++ data/com.canonical.powerd.xml	2014-04-23 02:22:08 +0000
@@ -51,7 +51,7 @@
     <method name="getBrightnessParams">
         <!-- Returns min, max, and default brighness and whether or not
              autobrightness is supported, in that order -->
-        <arg type="(iiib)" name="params" direction="out" />
+        <arg type="(iiiib)" name="params" direction="out" />
     </method>
 
     <method name="setUserBrightness">

=== modified file 'debian/changelog'
--- debian/changelog	2014-04-15 00:36:41 +0000
+++ debian/changelog	2014-04-23 02:22:08 +0000
@@ -1,3 +1,10 @@
+powerd (0.15-0ubuntu1) UNRELEASED; urgency=medium
+
+  * Also exporting dim brightness value via getBrightnessParams
+  * Bump major version due dbus API changes
+
+ -- Ricardo Salveti de Araujo <[e-mail]>  Tue, 22 Apr 2014 23:18:06 -0300
+
 powerd (0.14+14.04.20140415-0ubuntu1) trusty; urgency=low
 
   [ Michael Terry ]

=== modified file 'src/backlight.c'
--- src/backlight.c	2014-01-14 03:14:22 +0000
+++ src/backlight.c	2014-04-23 02:22:08 +0000
@@ -161,7 +161,8 @@
 {
     gboolean ab_available = powerd_autobrightness_available();
     g_dbus_method_invocation_return_value(invocation,
-                                          g_variant_new("((iiib))",
+                                          g_variant_new("((iiiib))",
+                                                        dim_brightness,
                                                         min_user_brightness,
                                                         max_brightness,
                                                         default_brightness,