andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
David Nusinow 2008-01-07 20:57:30 -05:00
parent 981bb9f1e3
commit 30375cd6d1
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hw/xfree86/common/xf86DPMS.c
View File

@ -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++;