rpms/gnome-power-manager/F-11 gnome-power-manager-2.26.4-work-around-xsync-bug.patch, NONE, 1.1 gnome-power-manager.spec, 1.160, 1.161

[Richard Hughes]

Author: rhughes

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

Modified Files:
	gnome-power-manager.spec 
Added Files:
	gnome-power-manager-2.26.4-work-around-xsync-bug.patch 
Log Message:
* 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


gnome-power-manager-2.26.4-work-around-xsync-bug.patch:
 gpm-idle.c |    9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

--- NEW FILE gnome-power-manager-2.26.4-work-around-xsync-bug.patch ---
commit bebf24f41c43f0b2338aefea87f39ba7423d02be
Author: Richard Hughes <richard at hughsie.com>
Date:   Fri Aug 14 11:17:45 2009 +0100

    Use a larger DPMS idletime timeout to mitigate an XSync bug

diff --git a/src/gpm-idle.c b/src/gpm-idle.c
index 852f0f3..abe6075 100644
--- a/src/gpm-idle.c
+++ b/src/gpm-idle.c
@@ -51,6 +51,11 @@
 #define GPM_IDLE_TIMEOUT_IGNORE_DPMS_CHANGE	1.0f /* seconds */
 #define	GPM_IDLE_IDLETIME_ID			1
 
+/* XSync seems to be unreliable when setting small values of time.
+ * Ideally we want this to be 1ms (or smaller!) to reduce the chance of a race,
+ * but this fails to trigger on some systems. */
+#define GPM_IDLE_SMALLEST_RESET_VALUE		500 /* ms */
+
 struct GpmIdlePrivate
 {
 	EggIdletime	*idletime;
@@ -366,8 +371,8 @@ gpm_idle_idletime_reset_cb (EggIdletime *idletime, GpmIdle *idle)
 	if (idle->priv->mode == GPM_IDLE_MODE_BLANK &&
 	    elapsed < GPM_IDLE_TIMEOUT_IGNORE_DPMS_CHANGE) {
 		egg_debug ("ignoring reset, as we've just done a state change");
-		/* make sure we trigger a short 1ms timeout so we can get the expired signal */
-		egg_idletime_alarm_set (idle->priv->idletime, GPM_IDLE_IDLETIME_ID, 1);
+		/* make sure we trigger a short timeout so we can get the expired signal */
+		egg_idletime_alarm_set (idle->priv->idletime, GPM_IDLE_IDLETIME_ID, GPM_IDLE_SMALLEST_RESET_VALUE);
 		return;
 	}
 


Index: gnome-power-manager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-power-manager/F-11/gnome-power-manager.spec,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -p -r1.160 -r1.161
--- gnome-power-manager.spec	3 Aug 2009 16:26:20 -0000	1.160
+++ gnome-power-manager.spec	20 Aug 2009 10:02:43 -0000	1.161
@@ -4,7 +4,7 @@
 Summary: GNOME Power Manager
 Name: gnome-power-manager
 Version: 2.26.4
-Release: 1%{?dist}
+Release: 2%{?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
@@ -12,6 +12,9 @@ Source: http://download.gnome.org/source
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://projects.gnome.org/gnome-power-manager/
 
+# upstream, bebf24f41c43f0b2338aefea87f39ba7423d02be
+Patch1:    gnome-power-manager-2.26.4-work-around-xsync-bug.patch
+
 BuildRequires: libgnomeui-devel
 BuildRequires: libglade2-devel
 BuildRequires: libwnck-devel
@@ -56,6 +59,7 @@ change preferences.
 
 %prep
 %setup -q
+%patch1 -p1 -b .xsync-bug
 
 %build
 %configure \
@@ -162,6 +166,9 @@ fi
 %{_datadir}/gnome-2.0/ui/GNOME_InhibitApplet.xml
 
 %changelog
+* 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
+
 * Mon Aug 03 2009 Richard Hughes  <rhughes at redhat.com> - 2.26.4-1
 - Update to 2.26.4
 - Fixes #514275, #512962 and #514249