projects
/
xscreensaver
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
http://ftp.x.org/contrib/applications/xscreensaver-2.17.tar.gz
[xscreensaver]
/
driver
/
lock.c
diff --git
a/driver/lock.c
b/driver/lock.c
index a79d21354297c55e4fb884544e5d9138fa495763..0d4c43e3ff663f5c393dad71073d48f1675ca93f 100644
(file)
--- 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,
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) +
(si->prefs.debug_p ? 69 : 0) +
-#endif
2);
XtManageChild (passwd_form);
#endif
2);
XtManageChild (passwd_form);
#endif
@@
-619,14
+618,12
@@
pop_passwd_dialog (saver_info *si)
roger(roger_label, 0, 0);
#endif /* HAVE_ATHENA */
roger(roger_label, 0, 0);
#endif /* HAVE_ATHENA */
-#ifdef DEBUG
if (!si->prefs.debug_p)
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. */
/* 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)
{
while (passwd_state == pw_read)
{