rpms/gnome-power-manager/FC-6 gnome-power-manager-2.16.0-remove-dpms-throttles.patch, NONE, 1.1 gnome-power-manager.spec, 1.66, 1.67

[fedora-cvs-commits at redhat.com]

Author: rstrode

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

Modified Files:
	gnome-power-manager.spec 
Added Files:
	gnome-power-manager-2.16.0-remove-dpms-throttles.patch 
Log Message:
- fix screensaver from going blank even when configured to show
  a screensaver (bug 216045)


gnome-power-manager-2.16.0-remove-dpms-throttles.patch:
 gpm-manager.c |    6 ++++++
 1 files changed, 6 insertions(+)

--- NEW FILE gnome-power-manager-2.16.0-remove-dpms-throttles.patch ---
--- gnome-power-manager-2.16.0/src/gpm-manager.c.remove-dpms-throttles	2006-11-18 20:38:25.000000000 -0500
+++ gnome-power-manager-2.16.0/src/gpm-manager.c	2006-11-18 20:39:48.000000000 -0500
@@ -682,6 +682,10 @@
 			manager->priv->dpms_throttle_id = 0;
 		}
 	} else {
+		/* if throttle already exists then remove */
+		if (manager->priv->dpms_throttle_id > 0) {
+			gpm_screensaver_remove_throttle (manager->priv->screensaver, manager->priv->dpms_throttle_id);
+		}
 		manager->priv->dpms_throttle_id = gpm_screensaver_add_throttle (manager->priv->screensaver, _("Display power management activated"));
 	}
 }
@@ -2926,6 +2930,8 @@
 	/* Do we ignore inhibit requests? */
 	manager->priv->ignore_inhibits = gconf_client_get_bool (manager->priv->gconf_client,
 								GPM_PREF_IGNORE_INHIBITS, NULL);
+ 	/* set no throttle */
+ 	manager->priv->dpms_throttle_id = -1;
 
 	/* poll the lid periodically to avoid #346082 */
 	g_timeout_add (1000 * 60, (GSourceFunc) manager_rescan_buttons, manager);


Index: gnome-power-manager.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-power-manager/FC-6/gnome-power-manager.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- gnome-power-manager.spec	4 Oct 2006 18:47:33 -0000	1.66
+++ gnome-power-manager.spec	27 Nov 2006 18:38:57 -0000	1.67
@@ -5,7 +5,7 @@
 Summary: GNOME Power Manager
 Name: gnome-power-manager
 Version: 2.16.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPL
 Group: Applications/System
 Source: gnome-power-manager-%{version}.tar.bz2
@@ -13,6 +13,7 @@
 Patch1: gnome-power-manager-2.15.92-mnemonics.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=356150
 Patch2: gnome-power-manager-2.16.0-tray-icon.patch
+Patch3: gnome-power-manager-2.16.0-remove-dpms-throttles.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://gnome-power.sourceforge.net/
 BuildPrereq: libgnomeui-devel
@@ -48,6 +49,7 @@
 %patch0 -p1 -b .nodefaultbeep
 %patch1 -p1 -b .mnemonics
 %patch2 -p1 -b .tray-icon
+%patch3 -p1 -b .remove-dpms-throttles
 
 %build
 %configure \
@@ -111,6 +113,10 @@
 %{_datadir}/icons/hicolor/*/apps/*
 
 %changelog
+* Mon Nov 27 2006 Ray Strode <rstrode at redhat.com> - 2.16.0-4.fc6
+- fix screensaver from going blank even when configured to show
+  a screensaver (bug 216045)
+
 * Wed Oct  4 2006 Matthias Clasen <mclasen at redhat.com> - 2.16.0-3
 - Don't install a broken symlink (#208399)