diff options
author | Adam Jackson <ajax@redhat.com> | 2010-02-15 16:54:35 -0500 |
---|---|---|
committer | Keith Packard <keithp@keithp.com> | 2010-04-26 20:04:39 -0700 |
commit | 2a763c9023b8bc978b32eaa56d2c625b6f2badee (patch) | |
tree | 7eee541ca923e8fd6b11b72eb0e1b940fbcbcc03 /dix | |
parent | 518f3b189b6c8aa28b62837d14309fd06163ccbb (diff) |
dix: Default DPMS timeout values to match screensaver values
These have the same default, but if you specify something different with
-s on the command line, only the screensaver time is changed. As DPMS
is usually what's desired, change it to match.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'dix')
-rw-r--r-- | dix/main.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/dix/main.c b/dix/main.c index f0235364f..b500ad767 100644 --- a/dix/main.c +++ b/dix/main.c @@ -161,9 +161,7 @@ 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 = DPMSSuspendTime = DPMSOffTime = ScreenSaverTime; DPMSEnabled = TRUE; DPMSPowerLevel = 0; #endif |