rpms/gnome-power-manager/devel gnome-power-manager-2.20.0-expected-return-types.patch, NONE, 1.1 gnome-power-manager-2.20.0-use-gerror.patch, NONE, 1.1 gnome-power-manager.spec, 1.98, 1.99

[David Zeuthen (davidz)]

Author: davidz

Update of /cvs/pkgs/rpms/gnome-power-manager/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18575

Modified Files:
	gnome-power-manager.spec 
Added Files:
	gnome-power-manager-2.20.0-expected-return-types.patch 
	gnome-power-manager-2.20.0-use-gerror.patch 
Log Message:
* Fri Oct  5 2007 David Zeuthen <davidz at redhat.com> - 2.20.0-3
- Fix the "Sleep problem" popup (#312761)



gnome-power-manager-2.20.0-expected-return-types.patch:

--- NEW FILE gnome-power-manager-2.20.0-expected-return-types.patch ---
--- gnome-power-manager-2.20.0.orig/libhal-glib/libhal-gpower.c	2007-10-05 10:52:20.000000000 -0400
+++ gnome-power-manager-2.20.0/libhal-glib/libhal-gpower.c	2007-10-05 10:50:47.000000000 -0400
@@ -247,7 +247,7 @@
 	ret = dbus_g_proxy_call (proxy, "Suspend", error,
 				 G_TYPE_INT, wakeup,
 				 G_TYPE_INVALID,
-				 G_TYPE_UINT, &retval,
+				 G_TYPE_INT, &retval,
 				 G_TYPE_INVALID);
 	/* we might have to ignore the error */
 	if (error != NULL && hal_gpower_filter_error (error) == TRUE) {
@@ -291,7 +291,7 @@
 
 	ret = dbus_g_proxy_call (proxy, method, error,
 				 G_TYPE_INVALID,
-				 G_TYPE_UINT, &retval,
+				 G_TYPE_INT, &retval,
 				 G_TYPE_INVALID);
 	/* we might have to ignore the error */
 	if (error != NULL && hal_gpower_filter_error (error) == TRUE) {
@@ -382,7 +382,7 @@
 	ret = dbus_g_proxy_call (proxy, "SetPowerSave", &error,
 				 G_TYPE_BOOLEAN, enable,
 				 G_TYPE_INVALID,
-				 G_TYPE_UINT, &retval,
+				 G_TYPE_INT, &retval,
 				 G_TYPE_INVALID);
 	if (retval != 0) {
 		g_warning ("SetPowerSave failed in a horrible way!");
--- gnome-power-manager-2.20.0.orig/src/gpm-brightness-lcd.c	2007-10-05 13:57:37.000000000 -0400
+++ gnome-power-manager-2.20.0/src/gpm-brightness-lcd.c	2007-10-05 13:57:52.000000000 -0400
@@ -84,7 +84,7 @@
 	GError *error = NULL;
 	gboolean ret;
 	DBusGProxy *proxy;
-	int level = 0;
+	gint level = 0;
 
 	g_return_val_if_fail (brightness != NULL, FALSE);
 	g_return_val_if_fail (GPM_IS_BRIGHTNESS_LCD (brightness), FALSE);
@@ -97,7 +97,7 @@
 
 	ret = dbus_g_proxy_call (proxy, "GetBrightness", &error,
 				 G_TYPE_INVALID,
-				 G_TYPE_UINT, &level,
+				 G_TYPE_INT, &level,
 				 G_TYPE_INVALID);
 
 	if (brightness_level_hw != NULL) {
@@ -155,9 +155,9 @@
 	gpm_debug ("Setting %i of %i", brightness_level_hw, brightness->priv->levels - 1);
 
 	ret = dbus_g_proxy_call (proxy, "SetBrightness", &error,
-				 G_TYPE_INT, (int)brightness_level_hw,
+				 G_TYPE_INT, (gint)brightness_level_hw,
 				 G_TYPE_INVALID,
-				 G_TYPE_UINT, &retval,
+				 G_TYPE_INT, &retval,
 				 G_TYPE_INVALID);
 	/* retval is ignored, the HAL API is broken... */
 

gnome-power-manager-2.20.0-use-gerror.patch:

--- NEW FILE gnome-power-manager-2.20.0-use-gerror.patch ---
--- gnome-power-manager-2.20.0.orig/src/gpm-manager.c	2007-10-05 13:52:51.000000000 -0400
+++ gnome-power-manager-2.20.0/src/gpm-manager.c	2007-10-05 13:51:43.000000000 -0400
@@ -304,6 +304,7 @@
 gpm_manager_action_suspend (GpmManager *manager, const gchar *reason)
 {
 	gboolean allowed;
+	GError *error = NULL;
 
 	if (gpm_control_is_policy_timout_valid (manager->priv->control) == FALSE) {
 		/* error msg timeout not valid */
@@ -344,7 +345,10 @@
 
 	gpm_info_explain_reason (manager->priv->info, GPM_EVENT_SUSPEND,
 				_("Suspending computer"), reason);
-	gpm_control_suspend (manager->priv->control, NULL);
+	gpm_control_suspend (manager->priv->control, &error);
+	if (error != NULL) {
+		g_error_free (error);
+	}
 	return TRUE;
 }
 
@@ -355,6 +359,7 @@
 gpm_manager_action_hibernate (GpmManager *manager, const gchar *reason)
 {
 	gboolean allowed;
+	GError *error = NULL;
 
 	if (gpm_control_is_policy_timout_valid (manager->priv->control) == FALSE) {
 		/* error msg timeout not valid */
@@ -395,7 +400,10 @@
 
 	gpm_info_explain_reason (manager->priv->info, GPM_EVENT_SUSPEND,
 				_("Hibernating computer"), reason);
-	gpm_control_hibernate (manager->priv->control, NULL);
+	gpm_control_hibernate (manager->priv->control, &error);
+	if (error != NULL) {
+		g_error_free (error);
+	}
 	return TRUE;
 }
 


Index: gnome-power-manager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-power-manager/devel/gnome-power-manager.spec,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- gnome-power-manager.spec	5 Oct 2007 18:02:59 -0000	1.98
+++ gnome-power-manager.spec	5 Oct 2007 18:21:49 -0000	1.99
@@ -5,12 +5,15 @@
 Summary: GNOME Power Manager
 Name: gnome-power-manager
 Version: 2.20.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+ and GFDL+
 Group: Applications/System
 Source: http://download.gnome.org/sources/gnome-power-manager/2.20/gnome-power-manager-%{version}.tar.bz2
 # http://bugzilla.gnome.org/show_bug.cgi?id=483826
 Patch0: no-background.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=312761
+Patch1: gnome-power-manager-2.20.0-expected-return-types.patch
+Patch2: gnome-power-manager-2.20.0-use-gerror.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://gnome-power.sourceforge.net/
 BuildPrereq: libgnomeui-devel
@@ -47,6 +50,8 @@
 %prep
 %setup -q
 %patch0 -p1 -b .no-background
+%patch1 -p1 -b .expected-return-types
+%patch2 -p1 -b .use-gerror
 
 %build
 %configure \
@@ -121,10 +126,14 @@
 %{_datadir}/gnome-2.0/ui/GNOME_InhibitApplet.xml
 
 %changelog 
+* Fri Oct  5 2007 David Zeuthen <davidz at redhat.com> - 2.20.0-3
+- Fix the "Sleep problem" popup (#312761)
+
 * Fri Oct  5 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0-2
 - Make the inhibit applet work with all background settings 
   of the panel.
 
+>>>>>>> 1.98
 * Mon Sep 17 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0-1
 - Update to 2.20.0