diff options
author | Pierre Ossman <ossman@cendio.se> | 2014-03-19 14:03:53 +0000 |
---|---|---|
committer | Pierre Ossman <ossman@cendio.se> | 2014-03-19 14:03:53 +0000 |
commit | 604648da116336a299bd9ff21f9c32c9b401a5c4 (patch) | |
tree | 65ee74ba58b02bbcdd2f5b8622efe168e7ab83cc /contrib/packages/rpm/el5/SOURCES/xserver-1.7.4-dpms-timeouts.patch | |
parent | 266eec4ecf338f3f08771f8dfe79dbd5d9da00a1 (diff) | |
download | tigervnc-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/el5/SOURCES/xserver-1.7.4-dpms-timeouts.patch')
-rw-r--r-- | contrib/packages/rpm/el5/SOURCES/xserver-1.7.4-dpms-timeouts.patch | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/contrib/packages/rpm/el5/SOURCES/xserver-1.7.4-dpms-timeouts.patch b/contrib/packages/rpm/el5/SOURCES/xserver-1.7.4-dpms-timeouts.patch new file mode 100644 index 00000000..80765e29 --- /dev/null +++ b/contrib/packages/rpm/el5/SOURCES/xserver-1.7.4-dpms-timeouts.patch @@ -0,0 +1,29 @@ +From 4704b4d3d60bc40dcb9fbd050ca1ffdf42cbeaf9 Mon Sep 17 00:00:00 2001 +From: Adam Jackson <ajax@redhat.com> +Date: Fri, 12 Feb 2010 14:34:28 -0500 +Subject: [PATCH] Inherit the DPMS timeouts from -s + +--- + dix/main.c | 6 +++--- + 1 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/dix/main.c b/dix/main.c +index f96245a..d887f5c 100644 +--- a/dix/main.c ++++ b/dix/main.c +@@ -159,9 +159,9 @@ int main(int argc, char *argv[], char *envp[]) + ScreenSaverBlanking = defaultScreenSaverBlanking; + ScreenSaverAllowExposures = defaultScreenSaverAllowExposures; + #ifdef DPMSExtension +- DPMSStandbyTime = DEFAULT_SCREEN_SAVER_TIME; +- DPMSSuspendTime = DEFAULT_SCREEN_SAVER_TIME; +- DPMSOffTime = DEFAULT_SCREEN_SAVER_TIME; ++ DPMSStandbyTime = defaultScreenSaverTime; ++ DPMSSuspendTime = defaultScreenSaverTime; ++ DPMSOffTime = defaultScreenSaverTime; + DPMSEnabled = TRUE; + DPMSPowerLevel = 0; + #endif +-- +1.6.5.2 + |