http://ftp.x.org/contrib/applications/xscreensaver-3.23.tar.gz

[xscreensaver] / driver / subprocs.c

diff --git a/driver/subprocs.c b/driver/subprocs.c
index c693d5b68a6cb6b0180d15dbd848bd3c469569b3..ad2a426adbafe43f894ecdd625776e8a069b2bf6 100644 (file)
--- a/driver/subprocs.c
+++ b/driver/subprocs.c
@@ -395,12 +395,6 @@ make_job (pid_t pid, const char *cmd)
     }
 
   while (isspace(*in)) in++;           /* skip whitespace */
-  if (first && *in == ':')             /* token was a visual name; skip it. */
-    {
-      out = name;
-      first = 0;
-      goto AGAIN;
-    }
   *out = 0;
 
   job->name = strdup(name);
@@ -771,7 +765,7 @@ select_visual_of_hack (saver_screen_info *ssi, screenhack *hack)
   saver_preferences *p = &si->prefs;
   Bool selected;
 
-  if (hack->visual && *hack->visual == ':')
+  if (hack->visual && *hack->visual)
     selected = select_visual(ssi, hack->visual);
   else
     selected = select_visual(ssi, 0);
@@ -912,8 +906,8 @@ spawn_screenhack (saver_info *si, Bool first_time_p)
     }
   else if (si->prefs.verbose_p)
     fprintf (stderr,
-             "%s: server reports that monitor has powered down; "
-             "not launching a new hack.\n", blurb());
+             "%s: X says monitor has powered down; "
+             "not launching a hack.\n", blurb());
 
   store_saver_status (si);  /* store current hack numbers */
 }
@@ -971,15 +965,14 @@ emergency_kill_subproc (saver_info *si)
 Bool
 screenhack_running_p (saver_info *si)
 {
-  Bool result = True;
+  Bool any_running_p = False;
   int i;
   for (i = 0; i < si->nscreens; i++)
     {
       saver_screen_info *ssi = &si->screens[i];
-      if (!ssi->pid)
-       result = False;
+      if (ssi->pid) any_running_p = True;
     }
-  return result;
+  return any_running_p;
 }
 
 \f