X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=driver%2Ftimers.c;h=c7434925286b02e2d13c8ba04e0cb689457af9c2;hp=f64190bc923580f91856e45320836062902a33f5;hb=6b1c86cf395f59389e4ece4ea8f4bea2c332745b;hpb=0d6b320def9180cf907ceaed56b23a972a11b757

diff --git a/driver/timers.c b/driver/timers.c
index f64190bc..c7434925 100644
--- a/driver/timers.c
+++ b/driver/timers.c
@@ -1,5 +1,5 @@
 /* timers.c --- detecting when the user is idle, and other timer-related tasks.
- * xscreensaver, Copyright (c) 1991-2004 Jamie Zawinski <jwz@jwz.org>
+ * xscreensaver, Copyright (c) 1991-2008 Jamie Zawinski <jwz@jwz.org>
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
  * documentation for any purpose is hereby granted without fee, provided that
@@ -336,11 +336,18 @@ reset_timers (saver_info *si)
      DPMS timer.  Without this, the -deactivate clientmessage would
      prevent xscreensaver from blanking, but would not prevent the
      monitor from powering down. */
+#if 0
+  /* #### With some servers, this causes the screen to flicker every
+     time a key is pressed!  Ok, I surrender.  I give up on ever
+     having DPMS work properly.
+   */
   XForceScreenSaver (si->dpy, ScreenSaverReset);
 
   /* And if the monitor is already powered off, turn it on.
      You'd think the above would do that, but apparently not? */
   monitor_power_on (si);
+#endif
+
 }
 
 
@@ -1186,7 +1193,10 @@ query_proc_interrupts_available (saver_info *si, const char **why)
 
   f = fopen (PROC_INTERRUPTS, "r");
   if (!f)
-    return False;
+    {
+      if (why) *why = "does not exist";
+      return False;
+    }
 
   fclose (f);
   return True;