r15271 - in /desktop/unstable/gnome-power-manager/debian: changelog patches/73-getbrightness-returns-int.patch

[sjoerd at users.alioth.debian.org]

Author: sjoerd
Date: Tue Mar 18 12:46:01 2008
New Revision: 15271

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=15271
Log:
* debian/patches/73-getbrightness-returns-int.patch:
  - Updated

Modified:
    desktop/unstable/gnome-power-manager/debian/changelog
    desktop/unstable/gnome-power-manager/debian/patches/73-getbrightness-returns-int.patch

Modified: desktop/unstable/gnome-power-manager/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-power-manager/debian/changelog?rev=15271&op=diff
==============================================================================
--- desktop/unstable/gnome-power-manager/debian/changelog (original)
+++ desktop/unstable/gnome-power-manager/debian/changelog Tue Mar 18 12:46:01 2008
@@ -8,8 +8,10 @@
   * New upstream release
   * debian/patches/02.gnome-power-manager.desktop.in.patch:
     - Dropped
-
- -- Michael Biebl <biebl at debian.org>  Tue, 04 Mar 2008 22:36:43 +0100
+  * debian/patches/73-getbrightness-returns-int.patch:
+    - Updated
+
+ -- Sjoerd Simons <sjoerd at debian.org>  Tue, 18 Mar 2008 13:45:37 +0100
 
 gnome-power-manager (2.20.2-3) unstable; urgency=low
 

Modified: desktop/unstable/gnome-power-manager/debian/patches/73-getbrightness-returns-int.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-power-manager/debian/patches/73-getbrightness-returns-int.patch?rev=15271&op=diff
==============================================================================
--- desktop/unstable/gnome-power-manager/debian/patches/73-getbrightness-returns-int.patch (original)
+++ desktop/unstable/gnome-power-manager/debian/patches/73-getbrightness-returns-int.patch Tue Mar 18 12:46:01 2008
@@ -1,12 +1,32 @@
-diff -ur gnome-power-manager-2.19.6.clean/src/gpm-brightness-kbd.c gnome-power-manager-2.19.6/src/gpm-brightness-kbd.c
---- gnome-power-manager-2.19.6.clean/src/gpm-brightness-kbd.c	2007-06-01 09:16:08.000000000 +0100
-+++ gnome-power-manager-2.19.6/src/gpm-brightness-kbd.c	2007-08-29 22:23:50.000000000 +0100
-@@ -105,7 +105,7 @@
+Index: src/gpm-brightness-kbd.c
+===================================================================
+--- src/gpm-brightness-kbd.c	(revision 2734)
++++ src/gpm-brightness-kbd.c	(working copy)
+@@ -93,6 +93,7 @@
+ 	GError     *error = NULL;
+ 	gboolean    ret;
+ 	DBusGProxy *proxy;
++	gint brightness_level;
+ 
+ 	g_return_val_if_fail (brightness != NULL, FALSE);
+ 	g_return_val_if_fail (GPM_IS_BRIGHTNESS_KBD (brightness), FALSE);
+@@ -105,7 +106,7 @@
  
  	ret = dbus_g_proxy_call (proxy, "GetBrightness", &error,
  				 G_TYPE_INVALID,
 -				 G_TYPE_UINT, brightness_level_hw,
-+				 G_TYPE_INT, brightness_level_hw,
++				 G_TYPE_INT, &brightness_level,
  				 G_TYPE_INVALID);
  	if (error) {
  		gpm_debug ("ERROR: %s", error->message);
+@@ -115,7 +116,9 @@
+ 		/* abort as the DBUS method failed */
+ 		gpm_warning ("GetBrightness failed!");
+ 		return FALSE;
+-	}
++	} 
++
++	*brightness_level_hw = (guint)brightness_level;
+ 	return TRUE;
+ }
+