[PATCH] dix: Default DPMS timeout values to match screensaver values

[Adam Jackson]

This seems to have gotten passed over, resending.

- ajax

On Mon, 2010-02-15 at 16:54 -0500, Adam Jackson wrote:
> 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 at redhat.com>
> ---
>  dix/main.c |    4 +---
>  1 files changed, 1 insertions(+), 3 deletions(-)
> 
> diff --git a/dix/main.c b/dix/main.c
> index f023536..b500ad7 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


-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: This is a digitally signed message part
URL: <http://lists.x.org/archives/xorg-devel/attachments/20100422/4977ef5b/attachment.pgp>