From ccec848329676a6e5926ea1a364cc8909c84a5bf Mon Sep 17 00:00:00 2001
From: Peter Hutterer <whot@fedoraproject.org>
Date: Aug 19 2009 04:24:53 +0000
Subject: * Tue Aug 18 2009 Peter Hutterer <peter.hutterer@redhat.com> 1.6.3-4

- xserver-1.6.99-eventtime.patch: don't reset the last event time when the
  screen saver activates.

---

diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index 88cc52c..8a4fefb 100644
--- a/xorg-x11-server.spec
+++ b/xorg-x11-server.spec
@@ -19,7 +19,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.6.3
-Release:   3%{?dist}
+Release:   4%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -113,8 +113,10 @@ Patch6047: xserver-1.6.2-vboxvideo.patch
 
 # 501601, upstream, nominated for 1.6.4
 Patch6048: xserver-1.6.3-sync-conditions.patch
-# 501601, part 2.
+# 501601, part 2, upstream.
 Patch6049: xserver-1.6.99-dpms.patch
+# 501601, part 3, upstream.
+Patch6050: xserver-1.6.99-eventtime.patch
 
 %define moduledir	%{_libdir}/xorg/modules
 %define drimoduledir	%{_libdir}/dri
@@ -532,6 +534,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Aug 18 2009 Peter Hutterer <peter.hutterer@redhat.com> 1.6.3-4
+- 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@redhat.com> 1.6.3-3
 - xserver-1.6.99-dpms.patch: don't reset last event time on DPMS changes.
 
diff --git a/xserver-1.6.99-eventtime.patch b/xserver-1.6.99-eventtime.patch
new file mode 100644
index 0000000..e44ed20
--- /dev/null
+++ b/xserver-1.6.99-eventtime.patch
@@ -0,0 +1,29 @@
+From 6b5978dcf1f7ac3ecc2f22df06f7000f360e2066 Mon Sep 17 00:00:00 2001
+From: Richard Hughes <richard@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@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
+