xserver: Branch 'master'

[David Nusinow]

 hw/xfree86/common/xf86DPMS.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 30375cd6d1439a3390b41714fe116aecc94743ca
Author: David Nusinow <dnusinow at debian.org>
Date:   Mon Jan 7 20:57:30 2008 -0500

    Don't log DPMS enabling as being from xorg.conf if it's not

diff --git a/hw/xfree86/common/xf86DPMS.c b/hw/xfree86/common/xf86DPMS.c
index a23d81d..4fb901a 100644
--- a/hw/xfree86/common/xf86DPMS.c
+++ b/hw/xfree86/common/xf86DPMS.c
@@ -60,6 +60,7 @@ xf86DPMSInit(ScreenPtr pScreen, DPMSSetProcPtr set, int flags)
     ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
     DPMSPtr pDPMS;
     pointer DPMSOpt;
+    MessageType enabled_from = X_INFO;
 
     DPMSKey = &DPMSKey;
 
@@ -78,6 +79,7 @@ xf86DPMSInit(ScreenPtr pScreen, DPMSSetProcPtr set, int flags)
 	    = xf86SetBoolOption(pScrn->options, "dpms", FALSE))
 	    && !DPMSDisabledSwitch)
 	    DPMSEnabled = TRUE;
+            enabled_from = X_CONFIG;
 	xf86MarkOptionUsed(DPMSOpt);
     } else if (DPMSEnabledSwitch) {
 	if (!DPMSDisabledSwitch)
@@ -88,7 +90,7 @@ xf86DPMSInit(ScreenPtr pScreen, DPMSSetProcPtr set, int flags)
 	pDPMS->Enabled = defaultDPMSEnabled;
     }
     if (pDPMS->Enabled)
-	xf86DrvMsg(pScreen->myNum, X_CONFIG, "DPMS enabled\n");
+	xf86DrvMsg(pScreen->myNum, enabled_from, "DPMS enabled\n");
     pDPMS->CloseScreen = pScreen->CloseScreen;
     pScreen->CloseScreen = DPMSClose;
     DPMSCount++;