aboutsummaryrefslogtreecommitdiffstats
path: root/contrib/packages/rpm/sle11/SOURCES/dpms_screensaver.diff
diff options
context:
space:
mode:
authorPierre Ossman <ossman@cendio.se>2014-03-19 14:03:53 +0000
committerPierre Ossman <ossman@cendio.se>2014-03-19 14:03:53 +0000
commit604648da116336a299bd9ff21f9c32c9b401a5c4 (patch)
tree65ee74ba58b02bbcdd2f5b8622efe168e7ab83cc /contrib/packages/rpm/sle11/SOURCES/dpms_screensaver.diff
parent266eec4ecf338f3f08771f8dfe79dbd5d9da00a1 (diff)
downloadtigervnc-604648da116336a299bd9ff21f9c32c9b401a5c4.tar.gz
tigervnc-604648da116336a299bd9ff21f9c32c9b401a5c4.zip
Backport the contrib directory from trunk as well as our new buildv1.3.11.3-branch
system relies on it. git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/branches/1_3@5173 3789f03b-4d11-0410-bbf8-ca57d06f2519
Diffstat (limited to 'contrib/packages/rpm/sle11/SOURCES/dpms_screensaver.diff')
-rw-r--r--contrib/packages/rpm/sle11/SOURCES/dpms_screensaver.diff14
1 files changed, 14 insertions, 0 deletions
diff --git a/contrib/packages/rpm/sle11/SOURCES/dpms_screensaver.diff b/contrib/packages/rpm/sle11/SOURCES/dpms_screensaver.diff
new file mode 100644
index 00000000..6feee652
--- /dev/null
+++ b/contrib/packages/rpm/sle11/SOURCES/dpms_screensaver.diff
@@ -0,0 +1,14 @@
+Index: xorg-server-1.6.3.901/hw/xfree86/common/xf86DPMS.c
+================================================================================
+--- xorg-server-1.7.99/hw/xfree86/common/xf86DPMS.c
++++ xorg-server-1.7.99/hw/xfree86/common/xf86DPMS.c
+@@ -156,7 +156,8 @@
+ rc = dixSaveScreens(client, SCREEN_SAVER_FORCER, ScreenSaverActive);
+ if (rc != Success)
+ return rc;
+- }
++ } else
++ dixSaveScreens(client, SCREEN_SAVER_FORCER, ScreenSaverReset);
+
+ /* For each screen, set the DPMS level */
+ for (i = 0; i < xf86NumScreens; i++) {