Merge lp:~kamalmostafa/ubuntu/oneiric/gnome-settings-daemon/bug-827517 into lp:ubuntu/oneiric/gnome-settings-daemon

[Kamal Mostafa]

The BRIGHTNESS_STEP_AMOUNT macro calculates a bogus value when called
as BRIGHTNESS_STEP_AMOUNT(max - min + 1) due to missing parentheses.

This simple patch fixes the macro.

[Jani Monoses (jani)]

Hello, was this fix submitted upstream?

[Kamal Mostafa (kamalmostafa)]

Hi Jani- No, I have not submitted it upstream. I'd be grateful if the Ubuntu gnome3 folks would submit it on my behalf; if that's not possible I will submit it, but please don't hold off applying this obvious and necessary fix to Ubuntu -- we need this fix in Oneiric (see bugs 827517 and 568611).

[Luke Yelavich (themuso)]

Merged in the lp:~ubuntu-desktop/gnome-settings-daemon/ubuntu packaging branch.

=== modified file 'debian/changelog'
--- debian/changelog	2011-08-16 10:31:48 +0000
+++ debian/changelog	2011-08-16 22:16:25 +0000
@@ -1,3 +1,10 @@
+gnome-settings-daemon (3.1.5-0ubuntu2) oneiric; urgency=low
+
+  * debian/patches/50_fix_brightness_step.patch
+    - fix the broken BRIGHTNESS_STEP_AMOUNT macro (LP: #827517)
+
+ -- Kamal Mostafa <[e-mail]>  Mon, 15 Aug 2011 16:50:45 -0700
+
 gnome-settings-daemon (3.1.5-0ubuntu1) oneiric; urgency=low
 
   * New upstream release
 
=== added file 'debian/patches/50_fix_brightness_step.patch'
--- debian/patches/50_fix_brightness_step.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/50_fix_brightness_step.patch	2011-08-16 22:16:25 +0000
@@ -0,0 +1,18 @@
+Description: fix BRIGHTESS_STEP_AMOUNT calculation macro
+Author: Kamal Mostafa <[e-mail]>
+Bug-Ubuntu: https://launchpad.net/bugs/827517
+
+The BRIGHTNESS_STEP_AMOUNT macro calculates a bogus value when called
+as BRIGHTNESS_STEP_AMOUNT(max - min + 1) due to missing parentheses.
+
+--- gnome-settings-daemon-3.1.4.orig/plugins/power/gsd-power-manager.c
++++ gnome-settings-daemon-3.1.4/plugins/power/gsd-power-manager.c
+@@ -121,7 +121,7 @@ static const gchar introspection_xml[] =
+ "</node>";
+ 
+ /* on ACPI machines we have 4-16 levels, on others it's ~150 */
+-#define BRIGHTNESS_STEP_AMOUNT(max) (max < 20 ? 1 : max / 20)
++#define BRIGHTNESS_STEP_AMOUNT(max) ((max) < 20 ? 1 : (max) / 20)
+ 
+ /* take a discrete value with offset and convert to percentage */
+ #define ABS_TO_PERCENTAGE(min, max, value) (((value - min) * 100) / (max - min))
 
=== modified file 'debian/patches/series'
--- debian/patches/series	2011-08-15 10:14:05 +0000
+++ debian/patches/series	2011-08-16 22:16:25 +0000
@@ -6,3 +6,4 @@
 40_xres_lcddefault.patch
 42_onlyshowin_unity.patch
 43_disable_locale_settings.patch
+50_fix_brightness_step.patch