rpms/gnome-power-manager/F-11 gnome-power-manager-fix-display-blank.patch, NONE, 1.1 gnome-power-manager.spec, 1.156, 1.157

[Richard Hughes]

Author: rhughes

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

Modified Files:
	gnome-power-manager.spec 
Added Files:
	gnome-power-manager-fix-display-blank.patch 
Log Message:
* Wed May 06 2009 Richard Hughes  <rhughes at redhat.com> - 2.26.1-3
- Backport a patch from upstream to fix backlight DPMS.
- Fixes #498041


gnome-power-manager-fix-display-blank.patch:

--- NEW FILE gnome-power-manager-fix-display-blank.patch ---
commit ede53de9e51bc484de2e04fdd90b5e4107b2aba2
Author: Kyle McMartin <kmcmartin at redhat.com>
Date:   Wed May 6 16:28:28 2009 +0100

    Only setup the blanking timeout when a timeout is set. Fixes rh#498041
    
    Signed-off-by: Richard Hughes <richard at hughsie.com>

diff --git a/src/gpm-idle.c b/src/gpm-idle.c
index 3e515e6..dbbd637 100644
--- a/src/gpm-idle.c
+++ b/src/gpm-idle.c
@@ -230,15 +230,18 @@ gpm_idle_evaluate (GpmIdle *idle)
 		gpm_idle_set_mode (idle, GPM_IDLE_MODE_DIM);
 	}
 
-	/* set up blank callback even when session is not idle */
-	if (idle->priv->timeout_blank_id == 0) {
+	/* set up blank callback even when session is not idle,
+	 * but only if we actually want to blank. */
+	if (idle->priv->timeout_blank_id == 0 &&
+	    idle->priv->timeout_blank != 0) {
 		egg_debug ("setting up blank callback");
 		idle->priv->timeout_blank_id = g_timeout_add_seconds (idle->priv->timeout_blank, (GSourceFunc) gpm_idle_blank_cb, idle);
 	}
 
 	/* only do the sleep timeout when the session is idle */
 	if (is_idle) {
-		if (idle->priv->timeout_sleep_id == 0) {
+		if (idle->priv->timeout_sleep_id == 0 &&
+		    idle->priv->timeout_sleep != 0) {
 			egg_debug ("setting up sleep callback = %i", idle->priv->timeout_blank);
 			idle->priv->timeout_sleep_id = g_timeout_add_seconds (idle->priv->timeout_sleep, (GSourceFunc) gpm_idle_sleep_cb, idle);
 		}


Index: gnome-power-manager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-power-manager/F-11/gnome-power-manager.spec,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -p -r1.156 -r1.157
--- gnome-power-manager.spec	23 Apr 2009 12:42:51 -0000	1.156
+++ gnome-power-manager.spec	6 May 2009 15:35:07 -0000	1.157
@@ -4,7 +4,7 @@
 Summary: GNOME Power Manager
 Name: gnome-power-manager
 Version: 2.26.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+ and GFDL
 Group: Applications/System
 Source: http://download.gnome.org/sources/gnome-power-manager/2.25/gnome-power-manager-%{version}.tar.gz
@@ -12,6 +12,9 @@ Source: http://download.gnome.org/source
 # Already upstream: 1a170f276931360ff6255df667fb5e53678f4913
 Patch0:    gnome-power-manager-2.26.1-backport-gpp-correctly.patch
 
+# Already upstream: ede53de9e51bc484de2e04fdd90b5e4107b2aba2
+Patch1:    gnome-power-manager-fix-display-blank.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://projects.gnome.org/gnome-power-manager/
 
@@ -60,6 +63,7 @@ change preferences.
 %prep
 %setup -q
 %patch0 -p1 -b .backport-gpp
+%patch1 -p1 -b .fix-backlight-dpms
 
 %build
 %configure \
@@ -167,6 +171,10 @@ fi
 %{_datadir}/gnome-2.0/ui/GNOME_InhibitApplet.xml
 
 %changelog
+* Wed May 06 2009 Richard Hughes  <rhughes at redhat.com> - 2.26.1-3
+- Backport a patch from upstream to fix backlight DPMS.
+- Fixes #498041
+
 * Thu Apr 23 2009 Richard Hughes  <rhughes at redhat.com> - 2.26.1-2
 - Backport a patch from upstream that was missed for 2.26.1 that fixes
   the DPMS timeout slider in gnome-power-preferences.