Index: programs/Xserver/os/WaitFor.c
===================================================================
RCS file: /work/eich/freedesktop/cvs/xorg/xc/programs/Xserver/os/WaitFor.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- programs/Xserver/os/WaitFor.c	23 Apr 2004 19:54:28 -0000	1.2
+++ programs/Xserver/os/WaitFor.c	18 Oct 2004 14:21:46 -0000	1.3
@@ -663,17 +663,11 @@
     if (!DPMSEnabled)
         return;
 
-    if (DPMSStandbyTime > 0) {
-        DPMSStandbyTimer = TimerSet(DPMSStandbyTimer, 0, DPMSStandbyTime,
-                                    DPMSStandbyTimerExpire, NULL);
-    }
-    if (DPMSSuspendTime > 0) {
-        DPMSSuspendTimer = TimerSet(DPMSSuspendTimer, 0, DPMSSuspendTime,
-                                    DPMSSuspendTimerExpire, NULL);
-    }
-    if (DPMSOffTime > 0) {
-        DPMSOffTimer = TimerSet(DPMSOffTimer, 0, DPMSOffTime,
-                                DPMSOffTimerExpire, NULL);
-    }
+    DPMSStandbyTimer = TimerSet(DPMSStandbyTimer, 0, DPMSStandbyTime,
+				DPMSStandbyTimerExpire, NULL);
+    DPMSSuspendTimer = TimerSet(DPMSSuspendTimer, 0, DPMSSuspendTime,
+				DPMSSuspendTimerExpire, NULL);
+    DPMSOffTimer = TimerSet(DPMSOffTimer, 0, DPMSOffTime,
+			    DPMSOffTimerExpire, NULL);
 }
 #endif