rpms/gnome-power-manager/devel gnome-power-manager-2.13.5-lid-suspend.patch, NONE, 1.1 gnome-power-manager-2.13.5-xdg.patch, NONE, 1.1 gnome-power-manager.spec, 1.18, 1.19

Tue Feb 7 16:12:54 UTC 2006

Author: caillon

Update of /cvs/dist/rpms/gnome-power-manager/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3697

Modified Files:
	gnome-power-manager.spec 
Added Files:
	gnome-power-manager-2.13.5-lid-suspend.patch 
	gnome-power-manager-2.13.5-xdg.patch 
Log Message:
* Tue Feb  7 2006 Christopher Aillon <caillon at redhat.com> - 2.13.5-3
- Install into the autostart directory
- Don't suspend on lid close while on AC power


gnome-power-manager-2.13.5-lid-suspend.patch:
 gpm-manager.c |   18 +++++++++++++++---
 1 files changed, 15 insertions(+), 3 deletions(-)

--- NEW FILE gnome-power-manager-2.13.5-lid-suspend.patch ---
Index: src/gpm-manager.c
===================================================================
RCS file: /cvs/gnome/gnome-power-manager/src/gpm-manager.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -d -u -p -r1.36 -r1.37
--- src/gpm-manager.c	5 Feb 2006 16:36:09 -0000	1.36
+++ src/gpm-manager.c	6 Feb 2006 00:05:42 -0000	1.37
@@ -914,8 +914,11 @@ lid_button_pressed (GpmManager	 *manager
 	GpmDpmsMode mode;
 	GError     *error;
 	gboolean    res;
+	gboolean    on_ac;
 
-	g_debug ("lid button changed: %d", state);
+	gpm_power_get_on_ac (manager->priv->power, &on_ac, NULL);
+
+	g_debug ("lid_button_pressed: button changed: %d", state);
 
 	/*
 	 * We enable/disable DPMS because some laptops do
@@ -924,8 +927,17 @@ lid_button_pressed (GpmManager	 *manager
 	 * http://bugzilla.gnome.org/show_bug.cgi?id=321313
 	 */
 	if (state) {
-		/* we only do a policy event when the lid is CLOSED */
-		manager_policy_do (manager, GPM_PREF_BUTTON_LID);
+		/*
+		 * We only do a policy event when the lid is CLOSED
+		 * and we are on battery power. See
+		 * http://bugzilla.gnome.org/show_bug.cgi?id=329512
+		 */
+		if (on_ac) {
+			g_debug ("lid_button_pressed: Ignoring policy as on AC");
+		} else {
+			g_debug ("lid_button_pressed: Performing policy as on battery");
+			manager_policy_do (manager, GPM_PREF_BUTTON_LID);
+		}
 		mode = GPM_DPMS_MODE_OFF;
 	} else {
 		mode = GPM_DPMS_MODE_ON;

gnome-power-manager-2.13.5-xdg.patch:
 Makefile.am                 |    2 +-
 gnome-power-manager.spec.in |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE gnome-power-manager-2.13.5-xdg.patch ---
? gpm-xdg.patch
? libnotify-0.3.0-4.i386.rpm
Index: data/Makefile.am
===================================================================
RCS file: /cvs/gnome/gnome-power-manager/data/Makefile.am,v
retrieving revision 1.4
diff -d -u -p -r1.4 Makefile.am
--- data/Makefile.am	24 Jan 2006 11:16:33 -0000	1.4
+++ data/Makefile.am	28 Jan 2006 17:38:44 -0000
@@ -10,7 +10,7 @@ desktop_in_files = gnome-power-preferenc
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 @INTLTOOL_DESKTOP_RULE@
 
-autostartdir = $(datadir)/autostart
+autostartdir = $(sysconfdir)/xdg/autostart
 autostart_in_files = gnome-power-manager.desktop.in
 autostart_DATA = $(autostart_in_files:.desktop.in=.desktop)
 
Index: data/gnome-power-manager.spec.in
===================================================================
RCS file: /cvs/gnome/gnome-power-manager/data/gnome-power-manager.spec.in,v
retrieving revision 1.5
diff -d -u -p -r1.5 gnome-power-manager.spec.in
--- data/gnome-power-manager.spec.in	24 Jan 2006 11:23:58 -0000	1.5
+++ data/gnome-power-manager.spec.in	28 Jan 2006 17:38:44 -0000
@@ -94,7 +94,7 @@ fi
 %{_sysconfdir}/gconf/schemas/*.schemas
 %{_datadir}/gnome/help/gnome-power-manager/C/*
 %{_datadir}/omf/gnome-power-manager/*
-%{_datadir}/autostart/*
+%{_sysconfdir}/xdg/autostart/*
 
 %changelog
 * Sun Nov 27 2005 Richard Hughes <richard at hughsie.com> 0.3.1-1


Index: gnome-power-manager.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-power-manager/devel/gnome-power-manager.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- gnome-power-manager.spec	7 Feb 2006 11:54:28 -0000	1.18
+++ gnome-power-manager.spec	7 Feb 2006 16:12:52 -0000	1.19
@@ -5,7 +5,7 @@
 Summary: GNOME Power Manager
 Name: gnome-power-manager
 Version: 2.13.5
-Release: 2.1
+Release: 3
 License: GPL
 Group: Applications/System
 Source: gnome-power-manager-%{version}.tar.bz2
@@ -16,14 +16,15 @@
 BuildPrereq: libwnck-devel
 BuildPrereq: hal-devel >= %{hal_version}
 BuildPrereq: dbus-devel >= %{dbus_version}
-BuildPrereq: libnotify
+BuildPrereq: libnotify-devel
 BuildRequires: scrollkeeper
 Requires: gnome-mime-data
 Requires: gnome-icon-theme
 Requires: hal >= %{hal_version}
 Requires: dbus-glib >= %{dbus_version}
 Requires: scrollkeeper
-
+Patch1: gnome-power-manager-2.13.5-xdg.patch
+Patch2: gnome-power-manager-2.13.5-lid-suspend.patch
 %description
 GNOME Power Manager uses the information and facilities provided by HAL 
 displaying icons and handling user callbacks in an interactive GNOME session. 
@@ -32,6 +33,8 @@
 
 %prep
 %setup -q
+%patch1 -p0
+%patch2 -p0
 
 %build
 %configure --disable-scrollkeeper
@@ -45,11 +48,7 @@
 
 desktop-file-install --vendor gnome --delete-original                   \
   --dir $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart                     \
-  $RPM_BUILD_ROOT%{_datadir}/autostart/gnome-power-manager.desktop
-
-# remove this line when we switch to autostart gnome-session and
-# get the launching code out of gnome-settings-daemon
-echo "Hidden=true" >> $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/gnome-power-manager.desktop
+  $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/gnome-power-manager.desktop
 
 %find_lang %name
 
@@ -84,6 +83,10 @@
 %{_datadir}/applications/gnome-power-preferences.desktop
 
 %changelog
+* Tue Feb  7 2006 Christopher Aillon <caillon at redhat.com> - 2.13.5-3
+- Install into the autostart directory
+- Don't suspend on lid close while on AC power
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.13.5-2.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 


