X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=driver%2Fdemo-Gtk-conf.c;h=bac6ecc7539b4e1a984e5cbb86817c7d61181fc2;hb=aa75c7476aeaa84cf3abc192b376a8b03c325213;hp=b9c9479ceecd9eaa984ca292fc1d7bd340a13765;hpb=50be9bb40dc60130c99ffa568e6677779904ff70;p=xscreensaver diff --git a/driver/demo-Gtk-conf.c b/driver/demo-Gtk-conf.c index b9c9479c..bac6ecc7 100644 --- 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-2008 Jamie Zawinski + * xscreensaver, Copyright (c) 2001-2014 Jamie Zawinski * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that @@ -298,8 +298,10 @@ make_parameter (const char *filename, xmlNodePtr node) else if (!strcmp (name, "number")) p->type = SPINBUTTON; else if (!strcmp (name, "select")) p->type = SELECT; - else if (!strcmp (name, "xscreensaver-text") || /* these are ignored in X11 */ - !strcmp (name, "xscreensaver-image")) /* (they are used in Cocoa) */ + else if (!strcmp (name, "xscreensaver-text") || /* ignored in X11; */ + !strcmp (name, "xscreensaver-image") || /* used in Cocoa. */ + !strcmp (name, "xscreensaver-updater") || + !strcmp (name, "video")) { free (p); return 0; @@ -1168,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 == '\\')