debian/changelog | 10 ++++++++++ debian/patches/183_dont_reset_event_time.patch | 25 +++++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 36 insertions(+)
New commits: commit 269b6ae9a29636d1d1c2514b257c0fcf8a4ed58e Author: Bryce Harrington <[email protected]> Date: Wed Aug 19 10:40:07 2009 -0700 Add another patch for blanking diff --git a/debian/changelog b/debian/changelog index 25f578b..9345acb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +xorg-server (2:1.6.3-1ubuntu3) karmic; urgency=low + + * Add 183_dont_reset_event_time.patch: Upstream cherrypick. + Fix another random display blanking issue. When we turn off DPMS with + DPMSModeOff and do dixSaveScreens, don't reset the event time else + session clients using IDLETIME will be reset. + See http://blogs.gnome.org/hughsie/2009/08/17/ + + -- Bryce Harrington <[email protected]> Wed, 19 Aug 2009 10:21:45 -0700 + xorg-server (2:1.6.3-1ubuntu2) karmic; urgency=low * Add 182_negative_sync_transitions.patch: Upstream cherrypick. diff --git a/debian/patches/183_dont_reset_event_time.patch b/debian/patches/183_dont_reset_event_time.patch new file mode 100644 index 0000000..de87a28 --- /dev/null +++ b/debian/patches/183_dont_reset_event_time.patch @@ -0,0 +1,25 @@ +From 6b5978dcf1f7ac3ecc2f22df06f7000f360e2066 Mon Sep 17 00:00:00 2001 +From: Richard Hughes <[email protected]> +Date: Mon, 17 Aug 2009 08:15:32 +0000 +Subject: 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 <[email protected]> +--- +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 +-- +cgit v0.8.2 diff --git a/debian/patches/series b/debian/patches/series index 65bc1e4..661f227 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -37,3 +37,4 @@ fedora-pci-primary.diff 180_fedora_no_synaptics_mouse_synthesis.patch 181_fedora_log_proc_cmdline.patch 182_negative_sync_transitions.patch +183_dont_reset_event_time.patch -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected]
