X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=driver%2Ftest-passwd.c;h=b9b6c328a7594244c30ebcc754c28dffa20064b5;hb=dba664f31aa87285db4d76cf8c5e66335299703a;hp=65615dd581da47c468921605dfcd3d73675b40d2;hpb=5f9c47ca98dd43d8f59b7c27d3fde6edfde4fe21;p=xscreensaver

diff --git a/driver/test-passwd.c b/driver/test-passwd.c
index 65615dd5..b9b6c328 100644
--- a/driver/test-passwd.c
+++ b/driver/test-passwd.c
@@ -1,4 +1,4 @@
-/* xscreensaver, Copyright (c) 1998-2011 Jamie Zawinski <jwz@jwz.org>
+/* xscreensaver, Copyright (c) 1998-2014 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
@@ -48,6 +48,7 @@ void initialize_screensaver_window (saver_info *si) {}
 void raise_window (saver_info *si, Bool i, Bool b, Bool d) {}
 Bool blank_screen (saver_info *si) {return False;}
 void unblank_screen (saver_info *si) {}
+void reset_watchdog_timer(saver_info *si, Bool on_p) {}
 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, Bool b) {}
@@ -64,6 +65,7 @@ void shutdown_stderr (saver_info *si) { }
 void resize_screensaver_window (saver_info *si) { }
 void describe_monitor_layout (saver_info *si) { }
 Bool update_screen_layout (saver_info *si) { return 0; }
+Bool in_signal_handler_p = 0;
 
 const char *blurb(void) { return progname; }
 Atom XA_SCREENSAVER, XA_DEMO, XA_PREFS;
@@ -79,7 +81,6 @@ idle_timer (XtPointer closure, XtIntervalId *id)
   XPutBackEvent (si->dpy, &fake_event);
 }
 
-
 static int
 text_auth_conv (
   int num_msg,
@@ -162,6 +163,7 @@ main (int argc, char **argv)
 
   si->version = (char *) malloc (5);
   memcpy (si->version, screensaver_id + 17, 4);
+  si->version[4] = 0;
   progname = argv[0];
   {
     char *s = strrchr(progname, '/');
@@ -202,7 +204,7 @@ main (int argc, char **argv)
 
   progclass = "XScreenSaver";
 
-  if (!setlocale(LC_ALL,""))
+  if (!setlocale (LC_CTYPE, ""))
     fprintf (stderr, "%s: warning: could not set default locale\n",
              progname);