From http://www.jwz.org/xscreensaver/xscreensaver-5.31.tar.gz

[xscreensaver] / driver / demo-Gtk-conf.c

diff --git a/driver/demo-Gtk-conf.c b/driver/demo-Gtk-conf.c
index 2f03a12f04e20870e152ece5d6e37c8b9a54e31b..bac6ecc7539b4e1a984e5cbb86817c7d61181fc2 100644 (file)
--- a/driver/demo-Gtk-conf.c
+++ b/driver/demo-Gtk-conf.c
@@ -1,5 +1,5 @@
 /* demo-Gtk-conf.c --- implements the dynamic configuration dialogs.
- * xscreensaver, Copyright (c) 2001-2013 Jamie Zawinski <jwz@jwz.org>
+ * xscreensaver, Copyright (c) 2001-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
@@ -300,7 +300,8 @@ make_parameter (const char *filename, xmlNodePtr node)
 
   else if (!strcmp (name, "xscreensaver-text") ||   /* ignored in X11; */
            !strcmp (name, "xscreensaver-image") ||  /* used in Cocoa. */
-           !strcmp (name, "xscreensaver-updater"))
+           !strcmp (name, "xscreensaver-updater") ||
+           !strcmp (name, "video"))
     {
       free (p);
       return 0;
@@ -1169,7 +1170,7 @@ de_stringify (char *s)
   char q = s[0];
   if (q != '\'' && q != '\"' && q != '`')
     abort();
-  memmove (s, s+1, strlen (s)+1);
+  memmove (s, s+1, strlen (s));
   while (*s && *s != q)
     {
       if (*s == '\\')