X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=driver%2Ftest-passwd.c;h=9d35812279f62de2f59c448997589be7fde85a40;hb=59ac4e9a0de290e4275a7bbb890ad16abd09d68f;hp=9510f803aefd6cdfa6538db165d0f3b0d0daa68d;hpb=c31d10b6605cd8dc1a7b61fef4256f06198767e5;p=xscreensaver

diff --git a/driver/test-passwd.c b/driver/test-passwd.c
index 9510f803..9d358122 100644
--- a/driver/test-passwd.c
+++ b/driver/test-passwd.c
@@ -14,7 +14,7 @@
    itself.
  */
 
-#define WHICH 2
+#define WHICH 0
 
 #ifdef HAVE_CONFIG_H
 # include "config.h"
@@ -31,6 +31,7 @@
 #include "xscreensaver.h"
 #include "resources.h"
 #include "version.h"
+#include "visual.h"
 
 char *progname = 0;
 char *progclass = 0;
@@ -47,7 +48,7 @@ void blank_screen (saver_info *si) {}
 void unblank_screen (saver_info *si) {}
 Bool select_visual (saver_screen_info *ssi, const char *v) { return False; }
 Bool window_exists_p (Display *dpy, Window window) {return True;}
-void start_notice_events_timer (saver_info *si, Window w) {}
+void start_notice_events_timer (saver_info *si, Window w, Bool) {}
 Bool handle_clientmessage (saver_info *si, XEvent *e, Bool u) { return False; }
 int BadWindow_ehandler (Display *dpy, XErrorEvent *error) { exit(1); }
 const char *signal_name(int signal) { return "???"; }
@@ -103,7 +104,8 @@ main (int argc, char **argv)
   set_auth_parameters(argc, argv);
 # endif /* SCO */
 
-  if (! lock_init (argc, argv))	/* before hack_uid() for proper permissions */
+  /* before hack_uid() for proper permissions */
+  if (! lock_init (argc, argv, True))
     {
       si->locking_disabled_p = True;
       si->nolock_reason = "error getting password";
@@ -126,6 +128,9 @@ main (int argc, char **argv)
       DefaultVisualOfScreen(si->default_screen->screen);
   si->default_screen->screensaver_window =
     RootWindowOfScreen(si->default_screen->screen);
+  si->default_screen->current_depth =
+    visual_depth(si->default_screen->screen,
+                 si->default_screen->current_visual);
 
   db = p->db;
   XtGetApplicationNameAndClass (si->dpy, &progname, &progclass);
@@ -158,9 +163,6 @@ main (int argc, char **argv)
 	XSync (si->dpy, False);
 	sleep (1);
       }
-#else
-      make_screenhack_dialog (si);
-      XtAppMainLoop(si->app);
 #endif
     }
 }