http://ftp.x.org/contrib/applications/xscreensaver-3.17.tar.gz

[xscreensaver] / driver / timers.c

diff --git a/driver/timers.c b/driver/timers.c
index ef5d54331707332d30f1da63947d640ae3ddffa4..a6a9486fb8fd312e8ec0a1d61663c79f8084e544 100644 (file)
--- a/driver/timers.c
+++ b/driver/timers.c
@@ -43,11 +43,6 @@
 #include <X11/extensions/XScreenSaver.h>
 #endif /* HAVE_SGI_SAVER_EXTENSION */
 
-#ifdef HAVE_XHPDISABLERESET
-# include <X11/XHPlib.h>
-  extern Bool hp_locked_p;     /* from windows.c */
-#endif /* HAVE_XHPDISABLERESET */
-
 #include "xscreensaver.h"
 
 #ifdef HAVE_PROC_INTERRUPTS
@@ -269,15 +264,7 @@ activate_lock_timer (XtPointer closure, XtIntervalId *id)
 
   if (p->verbose_p)
     fprintf (stderr, "%s: timed out; activating lock.\n", blurb());
-  si->locked_p = True;
-
-#ifdef HAVE_XHPDISABLERESET
-  if (!hp_locked_p)
-    {
-      XHPDisableReset (si->dpy);       /* turn off C-Sh-Reset */
-      hp_locked_p = True;
-    }
-#endif
+  set_locked_p (si, True);
 }