rpms/xorg-x11-server/devel xserver-1.6.99-eventtime.patch, NONE, 1.1 xorg-x11-server.spec, 1.472, 1.473

[Peter Hutterer]

Author: whot

Update of /cvs/pkgs/rpms/xorg-x11-server/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4787

Modified Files:
	xorg-x11-server.spec 
Added Files:
	xserver-1.6.99-eventtime.patch 
Log Message:
* Wed Aug 19 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.6.99-36.20090814
- xserver-1.6.99-eventtime.patch: don't reset the last event time when the
  screen saver activates.


xserver-1.6.99-eventtime.patch:
 window.c |    3 ---
 1 file changed, 3 deletions(-)

--- NEW FILE xserver-1.6.99-eventtime.patch ---
>From 6b5978dcf1f7ac3ecc2f22df06f7000f360e2066 Mon Sep 17 00:00:00 2001
From: Richard Hughes <richard at hughsie.com>
Date: Mon, 17 Aug 2009 09:15:32 +0100
Subject: [PATCH] Do not reset lastDeviceEventTime when we do dixSaveScreens

When we turn off DPMS with DPMSModeOff and do dixSaveScreens, don't reset the
event time else session clients using IDLETIME will be reset.

Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
---
 dix/window.c |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/dix/window.c b/dix/window.c
index 32e26d9..1a645f6 100644
--- a/dix/window.c
+++ b/dix/window.c
@@ -3128,8 +3128,6 @@ dixSaveScreens(ClientPtr client, int on, int mode)
 
     if (on == SCREEN_SAVER_FORCER)
     {
-	UpdateCurrentTimeIf();
-	lastDeviceEventTime = currentTime;
 	if (mode == ScreenSaverReset)
 	    what = SCREEN_SAVER_OFF;
 	else
-- 
1.6.3.rc1.2.g0164.dirty



Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.472
retrieving revision 1.473
diff -u -p -r1.472 -r1.473
--- xorg-x11-server.spec	17 Aug 2009 03:29:47 -0000	1.472
+++ xorg-x11-server.spec	19 Aug 2009 04:50:35 -0000	1.473
@@ -19,7 +19,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.6.99
-Release:   35.%{gitdate}%{?dist}
+Release:   36.%{gitdate}%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -82,8 +82,10 @@ Patch6029: xserver-1.6.1-proc-cmdline.pa
 Patch6030: xserver-1.6.99-right-of.patch
 Patch6031: xserver-1.6.99-dri2-crash-fixes.patch
 
-# dpms/idlecounter race condition. upstream soon
+# dpms/idlecounter race condition. upstream
 Patch6032: xserver-1.6.99-dpms.patch
+# screen saver/idlecounter race condition. upstream
+Patch6033: xserver-1.6.99-eventtime.patch
 
 %define moduledir	%{_libdir}/xorg/modules
 %define drimoduledir	%{_libdir}/dri
@@ -510,6 +512,10 @@ rm -rf $RPM_BUILD_ROOT
 %{xserver_source_dir}
 
 %changelog
+* Wed Aug 19 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.6.99-36.20090814
+- xserver-1.6.99-eventtime.patch: don't reset the last event time when the
+  screen saver activates.
+
 * Mon Aug 17 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.6.99-35.20090814
 - xserver-1.6.99-dpms.patch: don't reset last event time on DPMS changes.