http://ftp.aanet.ru/pub/Linux/X11/apps/xscreensaver-2.31.tar.gz

[xscreensaver] / driver / xset.c

diff --git a/driver/xset.c b/driver/xset.c
index 142acc325a35fba988530f1123fb1989647a2c85..d47a841e1abb18aa820d1a5f9cae9e741a5e378c 100644 (file)
--- a/driver/xset.c
+++ b/driver/xset.c
@@ -1,5 +1,5 @@
 /* xset.c --- interacting with server extensions and the builtin screensaver.
- * xscreensaver, Copyright (c) 1991-1998 Jamie Zawinski <jwz@netscape.com>
+ * xscreensaver, Copyright (c) 1991-1998 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
@@ -30,6 +30,10 @@
 
 #include "xscreensaver.h"
 
+#ifdef _VROOT_H_
+ERROR!  You must not include vroot.h in this file.
+#endif
+
 \f
 /* MIT SCREEN-SAVER server extension hackery.
  */
@@ -124,7 +128,7 @@ init_sgi_saver_extension (saver_info *si)
          fprintf (stderr,
        "%s: SGI SCREEN_SAVER extension exists, but can't be initialized;\n\
                perhaps some other screensaver program is already running?\n",
-                  progname);
+                  blurb());
          p->use_sgi_saver_extension = False;
          return;
        }
@@ -196,13 +200,14 @@ disable_builtin_screensaver (saver_info *si, Bool turn_off_p)
       desired_allow_exp != current_allow_exp)
     {
       if (desired_server_timeout == 0)
-       printf ("%s%sisabling server builtin screensaver.\n\
-       You can re-enable it with \"xset s on\".\n",
-               (p->verbose_p ? "" : progname),
+       fprintf (stderr,
+                "%s%sisabling server builtin screensaver.\n"
+                "\tYou can re-enable it with \"xset s on\".\n",
+               (p->verbose_p ? "" : blurb()),
                (p->verbose_p ? "\n\tD" : ": d"));
 
       if (p->verbose_p)
-       fprintf (stderr, "%s: (xset s %d %d %s %s)\n", progname,
+       fprintf (stderr, "%s: (xset s %d %d %s %s)\n", blurb(),
                 desired_server_timeout, desired_server_interval,
                 (desired_prefer_blank ? "blank" : "noblank"),
                 (desired_allow_exp ? "noexpose" : "expose"));
@@ -333,7 +338,7 @@ monitor_power_on (saver_info *si)
       if (!monitor_powered_on_p (si))
        fprintf (stderr,
        "%s: DPMSForceLevel(dpy, DPMSModeOn) did not power the monitor on?\n",
-                progname);
+                blurb());
     }
 }