X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=driver%2Flock.c;h=0d4c43e3ff663f5c393dad71073d48f1675ca93f;hb=df053bcb240bd8d82e3bebf48a9766a8728bca4b;hp=a79d21354297c55e4fb884544e5d9138fa495763;hpb=5b7bc6e70fb439cf4c4bf771ae9f94077fe4fe08;p=xscreensaver

diff --git a/driver/lock.c b/driver/lock.c
index a79d2135..0d4c43e3 100644
--- a/driver/lock.c
+++ b/driver/lock.c
@@ -597,9 +597,8 @@ pop_passwd_dialog (saver_info *si)
 			    passwd_form, 2);
 #else
   pop_up_dialog_box (passwd_dialog, passwd_form,
-#ifdef DEBUG
+		     /* for debugging -- don't ask */
 		     (si->prefs.debug_p ? 69 : 0) +
-#endif
 		     2);
   XtManageChild (passwd_form);
 #endif
@@ -619,14 +618,12 @@ pop_passwd_dialog (saver_info *si)
     roger(roger_label, 0, 0);
 #endif /* HAVE_ATHENA */
 
-#ifdef DEBUG
   if (!si->prefs.debug_p)
-#endif
-  XGrabServer (dpy);				/* ############ DANGER! */
+    XGrabServer (dpy);				/* ############ DANGER! */
 
   /* this call to ungrab used to be in main_loop() - see comment in
       xscreensaver.c around line 857. */
-  ungrab_keyboard_and_mouse (si->dpy);
+  ungrab_keyboard_and_mouse (si);
 
   while (passwd_state == pw_read)
     {