Don't log DPMS enabling as being from xorg.conf if it's not
This commit is contained in:
parent
981bb9f1e3
commit
30375cd6d1
|
@ -60,6 +60,7 @@ xf86DPMSInit(ScreenPtr pScreen, DPMSSetProcPtr set, int flags)
|
||||||
ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
|
ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
|
||||||
DPMSPtr pDPMS;
|
DPMSPtr pDPMS;
|
||||||
pointer DPMSOpt;
|
pointer DPMSOpt;
|
||||||
|
MessageType enabled_from = X_INFO;
|
||||||
|
|
||||||
DPMSKey = &DPMSKey;
|
DPMSKey = &DPMSKey;
|
||||||
|
|
||||||
|
@ -78,6 +79,7 @@ xf86DPMSInit(ScreenPtr pScreen, DPMSSetProcPtr set, int flags)
|
||||||
= xf86SetBoolOption(pScrn->options, "dpms", FALSE))
|
= xf86SetBoolOption(pScrn->options, "dpms", FALSE))
|
||||||
&& !DPMSDisabledSwitch)
|
&& !DPMSDisabledSwitch)
|
||||||
DPMSEnabled = TRUE;
|
DPMSEnabled = TRUE;
|
||||||
|
enabled_from = X_CONFIG;
|
||||||
xf86MarkOptionUsed(DPMSOpt);
|
xf86MarkOptionUsed(DPMSOpt);
|
||||||
} else if (DPMSEnabledSwitch) {
|
} else if (DPMSEnabledSwitch) {
|
||||||
if (!DPMSDisabledSwitch)
|
if (!DPMSDisabledSwitch)
|
||||||
|
@ -88,7 +90,7 @@ xf86DPMSInit(ScreenPtr pScreen, DPMSSetProcPtr set, int flags)
|
||||||
pDPMS->Enabled = defaultDPMSEnabled;
|
pDPMS->Enabled = defaultDPMSEnabled;
|
||||||
}
|
}
|
||||||
if (pDPMS->Enabled)
|
if (pDPMS->Enabled)
|
||||||
xf86DrvMsg(pScreen->myNum, X_CONFIG, "DPMS enabled\n");
|
xf86DrvMsg(pScreen->myNum, enabled_from, "DPMS enabled\n");
|
||||||
pDPMS->CloseScreen = pScreen->CloseScreen;
|
pDPMS->CloseScreen = pScreen->CloseScreen;
|
||||||
pScreen->CloseScreen = DPMSClose;
|
pScreen->CloseScreen = DPMSClose;
|
||||||
DPMSCount++;
|
DPMSCount++;
|
||||||
|
|
Loading…
Reference in New Issue
Block a user