rpms/gnome-power-manager/F-11 gnome-power-manager-2.26.1-ignore-hal-buttons-not-lid.patch, NONE, 1.1 gnome-power-manager.spec, 1.161, 1.162

[Richard Hughes]

Author: rhughes

Update of /cvs/pkgs/rpms/gnome-power-manager/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28133

Modified Files:
	gnome-power-manager.spec 
Added Files:
	gnome-power-manager-2.26.1-ignore-hal-buttons-not-lid.patch 
Log Message:
* Mon Aug 20 2009 Richard Hughes  <rhughes at redhat.com> - 2.26.4-3
- Actually apply the patch in #497743


gnome-power-manager-2.26.1-ignore-hal-buttons-not-lid.patch:
 gpm-button.c |    4 ++++
 1 file changed, 4 insertions(+)

--- NEW FILE gnome-power-manager-2.26.1-ignore-hal-buttons-not-lid.patch ---
diff -up gnome-power-manager-2.26.1/src/gpm-button.c~ gnome-power-manager-2.26.1/src/gpm-button.c
--- gnome-power-manager-2.26.1/src/gpm-button.c~	2009-04-21 11:43:28.000000000 +0100
+++ gnome-power-manager-2.26.1/src/gpm-button.c	2009-04-26 20:28:35.000000000 +0100
@@ -326,6 +326,10 @@ emit_button_pressed (GpmButton *button, 
 	/* we need to get the button state for lid buttons */
 	if (strcmp (type, "lid") == 0)
 		hal_device_get_bool (device, "button.state.value", &state, NULL);
+	else {
+		g_free (type);
+		return;
+	}
 
 	/* abstact away that HAL has an extra parameter */
 	if (strcmp (type, GPM_BUTTON_LID_DEP) == 0 && state == FALSE)


Index: gnome-power-manager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-power-manager/F-11/gnome-power-manager.spec,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -p -r1.161 -r1.162
--- gnome-power-manager.spec	20 Aug 2009 10:02:43 -0000	1.161
+++ gnome-power-manager.spec	20 Aug 2009 12:33:16 -0000	1.162
@@ -4,7 +4,7 @@
 Summary: GNOME Power Manager
 Name: gnome-power-manager
 Version: 2.26.4
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+ and GFDL
 Group: Applications/System
 Source: http://download.gnome.org/sources/gnome-power-manager/2.26/gnome-power-manager-%{version}.tar.gz
@@ -15,6 +15,9 @@ URL: http://projects.gnome.org/gnome-pow
 # upstream, bebf24f41c43f0b2338aefea87f39ba7423d02be
 Patch1:    gnome-power-manager-2.26.4-work-around-xsync-bug.patch
 
+# fedora bodge, already fixed a better way upstream
+Patch2:    gnome-power-manager-2.26.1-ignore-hal-buttons-not-lid.patch
+
 BuildRequires: libgnomeui-devel
 BuildRequires: libglade2-devel
 BuildRequires: libwnck-devel
@@ -60,6 +63,7 @@ change preferences.
 %prep
 %setup -q
 %patch1 -p1 -b .xsync-bug
+%patch2 -p1 -b ignore-hal-buttons
 
 %build
 %configure \
@@ -166,6 +170,9 @@ fi
 %{_datadir}/gnome-2.0/ui/GNOME_InhibitApplet.xml
 
 %changelog
+* Mon Aug 20 2009 Richard Hughes  <rhughes at redhat.com> - 2.26.4-3
+- Actually apply the patch in #497743
+
 * Mon Aug 20 2009 Richard Hughes  <rhughes at redhat.com> - 2.26.4-2
 - Use a larger DPMS idletime timeout to mitigate an XSync bug