diff options
| author | Egbert Eich <eich@suse.de> | 2004-03-03 12:12:50 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-03-03 12:12:50 +0000 |
| commit | 867451f1ab7b9870621725bd4be3dd8694c364b8 (patch) | |
| tree | b64281ced76a5e339f5407e59467b37ba2cf2b1d /os/WaitFor.c | |
| parent | 2934f0731b3d2bc9c1e25ceab26d9e0d9cadb054 (diff) | |
Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004xf86-4_4_0
Diffstat (limited to 'os/WaitFor.c')
| -rw-r--r-- | os/WaitFor.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/os/WaitFor.c b/os/WaitFor.c index 221296d11..3283dd5cf 100644 --- a/os/WaitFor.c +++ b/os/WaitFor.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/os/WaitFor.c,v 3.43 2003/10/29 04:17:22 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/os/WaitFor.c,v 3.42 2003/10/16 01:33:35 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -604,7 +604,8 @@ DPMSStandbyTimerExpire(OsTimerPtr timer,CARD32 now,pointer arg) return DPMSStandbyTime - timeout; } if (DPMSPowerLevel < DPMSModeStandby) { - DPMSSet(DPMSModeStandby); + if (DPMSEnabled) + DPMSSet(DPMSModeStandby); } return DPMSStandbyTime; } @@ -618,7 +619,8 @@ DPMSSuspendTimerExpire(OsTimerPtr timer,CARD32 now,pointer arg) return DPMSSuspendTime - timeout; } if (DPMSPowerLevel < DPMSModeSuspend) { - DPMSSet(DPMSModeSuspend); + if (DPMSEnabled) + DPMSSet(DPMSModeSuspend); } return DPMSSuspendTime; } @@ -632,7 +634,8 @@ DPMSOffTimerExpire(OsTimerPtr timer,CARD32 now,pointer arg) return DPMSOffTime - timeout; } if (DPMSPowerLevel < DPMSModeOff) { - DPMSSet(DPMSModeOff); + if (DPMSEnabled) + DPMSSet(DPMSModeOff); } return DPMSOffTime; } |