Index: gnome-power-manager-2.26.1-mebbe-fix-undesired-blanking.patch =================================================================== RCS file: gnome-power-manager-2.26.1-mebbe-fix-undesired-blanking.patch diff -N gnome-power-manager-2.26.1-mebbe-fix-undesired-blanking.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ gnome-power-manager-2.26.1-mebbe-fix-undesired-blanking.patch 2 May 2009 01:48:25 -0000 @@ -0,0 +1,17 @@ +diff --git a/src/gpm-idle.c b/src/gpm-idle.c +index 3e515e6..2408f55 100644 +--- a/src/gpm-idle.c ++++ b/src/gpm-idle.c +@@ -230,8 +230,10 @@ 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) { + 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); + } Index: gnome-power-manager.spec =================================================================== RCS file: /cvs/pkgs/rpms/gnome-power-manager/F-11/gnome-power-manager.spec,v retrieving revision 1.156 diff -u -p -r1.156 gnome-power-manager.spec --- gnome-power-manager.spec 23 Apr 2009 12:42:51 -0000 1.156 +++ gnome-power-manager.spec 2 May 2009 01:48:25 -0000 @@ -4,13 +4,14 @@ 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 # Already upstream: 1a170f276931360ff6255df667fb5e53678f4913 Patch0: gnome-power-manager-2.26.1-backport-gpp-correctly.patch +Patch1: gnome-power-manager-2.26.1-mebbe-fix-undesired-blanking.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) URL: http://projects.gnome.org/gnome-power-manager/ @@ -60,6 +61,7 @@ change preferences. %prep %setup -q %patch0 -p1 -b .backport-gpp +%patch1 -p1 -b .mebbe-fix-blanking %build %configure \ @@ -167,6 +169,9 @@ fi %{_datadir}/gnome-2.0/ui/GNOME_InhibitApplet.xml %changelog +* Fri May 01 2009 Kyle McMartin - 2.26.1-3 +- Maybe fix the screen blanking issue. (#498041) + * Thu Apr 23 2009 Richard Hughes - 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.