xserver: Branch 'master'

[Michel Dänzer]

On Sun, 2008-01-06 at 13:37 -0800, David Nusinow wrote:
> hw/xfree86/common/xf86DPMS.c |    3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> New commits:
> commit 260505e3c5a18044e97d31ea3bcc0955e46335c8
> Author: David Nusinow <dnusinow at debian.org>
> Date:   Sun Jan 6 16:37:13 2008 -0500
> 
>     Log enabling of DPMS even when it's not set in xorg.conf
> 
> diff --git a/hw/xfree86/common/xf86DPMS.c b/hw/xfree86/common/xf86DPMS.c
> index 43efb8e..a23d81d 100644
> --- a/hw/xfree86/common/xf86DPMS.c
> +++ b/hw/xfree86/common/xf86DPMS.c
> @@ -79,7 +79,6 @@ xf86DPMSInit(ScreenPtr pScreen, DPMSSetProcPtr set, int flags)
>  	    && !DPMSDisabledSwitch)
>  	    DPMSEnabled = TRUE;
>  	xf86MarkOptionUsed(DPMSOpt);
> -	xf86DrvMsg(pScreen->myNum, X_CONFIG, "DPMS enabled\n");
>      } else if (DPMSEnabledSwitch) {
>  	if (!DPMSDisabledSwitch)
>  	    DPMSEnabled = TRUE;
> @@ -88,6 +87,8 @@ xf86DPMSInit(ScreenPtr pScreen, DPMSSetProcPtr set, int flags)
>      else {
>  	pDPMS->Enabled = defaultDPMSEnabled;
>      }
> +    if (pDPMS->Enabled)
> +	xf86DrvMsg(pScreen->myNum, X_CONFIG, "DPMS enabled\n");

Please don't use X_CONFIG when it's not due to xorg.conf.


-- 
Earthling Michel Dänzer           |          http://tungstengraphics.com
Libre software enthusiast         |          Debian, X and DRI developer