5.45v29r2 v29r1

author: Simon Rettberg 2022-01-20 13:33:11 +0100
committer: Simon Rettberg 2022-01-20 13:33:11 +0100
commit: 3d748ebe7d900e96670ff3d455896998dfba6191 (patch)
tree: e8bbaf6531897a2292da2158a46e9dce3df96baf /driver
parent: Re-sync dpms settings on unblank (diff)
download: xscreensaver-29r1.tar.gz
xscreensaver-29r1.tar.xz
xscreensaver-29r1.zip
28 files changed, 4424 insertions, 3676 deletions
diff --git a/driver/Makefile.in b/driver/Makefile.in
index 7baf504..070a8b7 100644
--- a/driver/Makefile.in
+++ b/driver/Makefile.in
@@ -27,7 +27,8 @@ INTLTOOL_MERGE	= @INTLTOOL_MERGE@
 GTK_DATADIR	= @GTK_DATADIR@
 GTK_APPDIR	= $(GTK_DATADIR)/applications
 GTK_ICONDIR	= $(GTK_DATADIR)/pixmaps
-GTK_GLADEDIR	= $(GTK_DATADIR)/xscreensaver/glade
+GTK_UIDIR	= $(GTK_DATADIR)/xscreensaver/ui
+OLD_GLADEDIR	= $(GTK_DATADIR)/xscreensaver/glade
 HACK_CONF_DIR	= @HACK_CONF_DIR@
 
 CC		= @CC@
@@ -36,8 +37,8 @@ CFLAGS		= @CFLAGS@
 LDFLAGS		= @LDFLAGS@
 DEFS		= @DEFS@
 INTL_DEFS	= -DLOCALEDIR=\"$(localedir)\"
-SUBP_DEFS	= $(DEFS) -DDEFAULT_PATH_PREFIX='"@HACKDIR@"'
-GTK_DEFS	= $(DEFS) -DDEFAULT_ICONDIR='"$(GTK_GLADEDIR)"'
+SUBP_DEFS	= -DDEFAULT_PATH_PREFIX='"@HACKDIR@"'
+GTK_DEFS	= -DDEFAULT_ICONDIR='"$(GTK_UIDIR)"'
 CONF_DEFS	= -DHACK_CONFIGURATION_PATH='"$(HACK_CONF_DIR)"'
 
 LIBS		= @LIBS@
@@ -114,7 +115,7 @@ NOLOCK_SRCS_1	= lock.c
 NOLOCK_OBJS_1	= lock.o
 
 SYSTEMD_SRCS	= xscreensaver-systemd.c
-SYSTEMD_OBJS	= xscreensaver-systemd.o
+SYSTEMD_OBJS	= xscreensaver-systemd.o $(UTILS_BIN)/yarandom.o
 SYSTEMD_LIBS	= -lsystemd
 
 TEST_SRCS	= test-passwd.c test-uid.c  test-xdpms.c    test-grab.c \
@@ -245,7 +246,7 @@ MEN		= $(MEN_1) @MEN_OSX@
 
 EXTRAS		= README Makefile.in \
 		  XScreenSaver.ad.in XScreenSaver-Xm.ad xscreensaver.pam.in \
-		  xscreensaver-demo.glade2.in xscreensaver-demo.glade2p \
+		  xscreensaver-demo.ui \
 		  screensaver-properties.desktop.in \
 		  .gdbinit
 VMSFILES	= compile_axp.com compile_decc.com link_axp.com link_decc.com \
@@ -378,7 +379,7 @@ munge-scripts: $(SCRIPTS)
 install-man: $(MEN)
 	@men="$(MEN)" ;							\
 	U=$(UTILS_SRC)/version.h ;					\
-	V=`sed -n 's/.*xscreensaver \([0-9]\.[^)]*)\).*/\1/p' < $$U` ;		\
+	V=`sed -n 's/.*xscreensaver \([0-9]\.[^)]*)\).*/\1/p' < $$U` ;	\
 	T=/tmp/xs$$$$.$(mansuffix) ;					\
 	TH=".TH XScreenSaver $(mansuffix) \"$$V\" \"X Version 11\"" ;	\
 	echo "installing man pages: $$TH" ;				\
@@ -529,42 +530,42 @@ install-gnome:: $(LOGO)
         fi
 
 # ../utils/images/screensaver-*.png
-# into /usr/share/xscreensaver/glade/
+# into /usr/share/xscreensaver/ui/
 install-gnome::
-	@if [ "$(GTK_DATADIR)" != "" ]; then                                 \
-           if [ ! -d "$(install_prefix)$(GTK_GLADEDIR)" ]; then               \
-             echo $(INSTALL_DIRS) "$(install_prefix)$(GTK_GLADEDIR)"         ;\
-                  $(INSTALL_DIRS) "$(install_prefix)$(GTK_GLADEDIR)"         ;\
+	@if [ "$(GTK_DATADIR)" != "" ]; then                                  \
+           if [ ! -d "$(install_prefix)$(GTK_UIDIR)" ]; then                  \
+             echo $(INSTALL_DIRS) "$(install_prefix)$(GTK_UIDIR)"	     ;\
+                  $(INSTALL_DIRS) "$(install_prefix)$(GTK_UIDIR)"	     ;\
            fi                                                                ;\
 	   for target in $(GTK_ICONS) ; do				      \
 	     dest=`echo $$target | sed 's@^.*/@@'`			     ;\
 	     echo $(INSTALL_DATA) $$target				      \
-	          $(install_prefix)$(GTK_GLADEDIR)/$$dest		     ;\
+	          $(install_prefix)$(GTK_UIDIR)/$$dest			     ;\
 	          $(INSTALL_DATA) $$target				      \
-	          $(install_prefix)$(GTK_GLADEDIR)/$$dest		     ;\
+	          $(install_prefix)$(GTK_UIDIR)/$$dest			     ;\
 	   done								     ;\
         fi
 
-# xscreensaver-demo.glade2
-# into /usr/share/xscreensaver/glade/
-install-gnome:: xscreensaver-demo.glade2
+# xscreensaver-demo.ui
+# into /usr/share/xscreensaver/ui/
+install-gnome:: xscreensaver-demo.ui
 	@if [ "$(GTK_DATADIR)" != "" ]; then				      \
-	  if [ ! -d "$(install_prefix)$(GTK_GLADEDIR)" ]; then		      \
-	    echo $(INSTALL_DIRS) "$(install_prefix)$(GTK_GLADEDIR)"	     ;\
-	         $(INSTALL_DIRS) "$(install_prefix)$(GTK_GLADEDIR)"	     ;\
+	  if [ ! -d "$(install_prefix)$(GTK_UIDIR)" ]; then		      \
+	    echo $(INSTALL_DIRS) "$(install_prefix)$(GTK_UIDIR)"	     ;\
+	         $(INSTALL_DIRS) "$(install_prefix)$(GTK_UIDIR)"	     ;\
 	  fi								     ;\
-	  target=xscreensaver-demo.glade2				     ;\
-	  echo $(INSTALL_DATA) $$target                             \
-	    $(install_prefix)$(GTK_GLADEDIR)/$$target                        ;\
-	  if   $(INSTALL_DATA) $$target                             \
-	    $(install_prefix)$(GTK_GLADEDIR)/$$target                        ;\
+	  target=xscreensaver-demo.ui					     ;\
+	  echo $(INSTALL_DATA) $$target					      \
+	    $(install_prefix)$(GTK_UIDIR)/$$target			     ;\
+	  if   $(INSTALL_DATA) $$target					      \
+	    $(install_prefix)$(GTK_UIDIR)/$$target			     ;\
 	    then true                                                        ;\
           else                                                                \
 	    e=echo ;                                                          \
  $$e ""                                                                      ;\
  $$e "  ####################################################################";\
  $$e "  Warning: unable to install $$target into"			     ;\
- $$e "           $(install_prefix)$(GTK_GLADEDIR)/."                         ;\
+ $$e "           $(install_prefix)$(GTK_UIDIR)/."			     ;\
  $$e "           Without this file, xscreensaver-demo will not"              ;\
  $$e "           be able to run properly."                                   ;\
  $$e "  ####################################################################";\
@@ -593,25 +594,29 @@ uninstall-gnome::
 	 fi
 
 # ../utils/images/screensaver-*.png
-# into /usr/share/xscreensaver/glade/
+# into /usr/share/xscreensaver/ui/
 uninstall-gnome::
 	@if [ "$(GTK_DATADIR)" != "" ]; then				      \
 	   for target in $(GTK_ICONS) ; do				      \
 	     dest=`echo $$target | sed 's@^.*/@@'`			     ;\
-	     echo rm -f $(install_prefix)$(GTK_GLADEDIR)/$$dest              ;\
-	          rm -f $(install_prefix)$(GTK_GLADEDIR)/$$dest              ;\
+	     echo rm -f $(install_prefix)$(GTK_UIDIR)/$$dest                 ;\
+	          rm -f $(install_prefix)$(GTK_UIDIR)/$$dest                 ;\
 	   done								     ;\
         fi
 
-# xscreensaver-demo.glade2
-# into /usr/share/xscreensaver/glade/
-uninstall-gnome:: xscreensaver-demo.glade2
+# xscreensaver-demo.ui
+# into /usr/share/xscreensaver/ui/
+uninstall-gnome::
 	@if [ "$(GTK_DATADIR)" != "" ]; then				      \
-	  target=xscreensaver-demo.glade2				     ;\
-	  echo rm -f $(install_prefix)$(GTK_GLADEDIR)/$$target               ;\
-	       rm -f $(install_prefix)$(GTK_GLADEDIR)/$$target               ;\
+	  target=xscreensaver-demo.ui					     ;\
+	  echo rm -f $(install_prefix)$(GTK_UIDIR)/$$target                  ;\
+	       rm -f $(install_prefix)$(GTK_UIDIR)/$$target                  ;\
 	 fi
 
+# /usr/share/xscreensaver/glade/ no longer used
+uninstall-gnome::
+	-rm -rf $(OLD_GLADEDIR)
+
 # /usr/share/xscreensaver/config/README
 install-xml:
 	@dest=$(install_prefix)$(HACK_CONF_DIR) ;			\
@@ -632,9 +637,11 @@ clean:
 	XScreenSaver_ad.h XScreenSaver_Xm_ad.h
 
 distclean: clean
-	-rm -f Makefile XScreenSaver.ad \
-	TAGS *~ "#"* screensaver-properties.desktop \
-	xscreensaver-demo.glade2 \
+	-rm -f \
+	TAGS *~ "#"* *.rej *.orig \
+	Makefile \
+	XScreenSaver.ad \
+	screensaver-properties.desktop \
 	xscreensaver.pam
 
 # Adds all current dependencies to Makefile
@@ -679,12 +686,12 @@ update_ad_version::
 	@								    \
   files="XScreenSaver.ad.in ../hacks/config/README ../OSX/bindist.rtf" ;    \
   U=$(UTILS_SRC)/version.h ;						    \
-  V=`sed -n 's/[^0-9]*\([0-9]\.[0-9][^. ]*\).*/\1/p' < $$U` ;		    \
+  V=`sed -n 's/[^0-9]*\([0-9]\.[0-9][^ ]*\).*/\1/p' < $$U` ;		    \
   Y=`date '+%Y'` ;							    \
   D=`date '+%d-%b-%Y'` ;						    \
   for S in $$files ; do							    \
     T=/tmp/xs.$$$$ ;							    \
-    sed -e "s/\(.*version \)[0-9][0-9]*\.[0-9]*[ab]*[0-9]*\(.*\)/\1$$V\2/"  \
+    sed -e "s/\(.*version \)[0-9][0-9]*\.[0-9.]*[ab]*[0-9]*\(.*\)/\1$$V\2/" \
         -e "s/\([0-9][0-9]-[A-Z][a-z][a-z]-[0-9][0-9][0-9]*\)/$$D/"	    \
         -e "s/\( [0-9][0-9][0-9][0-9]-\)[0-9][0-9][0-9][0-9] /\1$$Y /"	    \
       < $$S > $$T ;							    \
@@ -751,32 +758,26 @@ $(UTIL_OBJS):
 	$(MAKE) $(@F) CC="$(CC)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)"
 
 # How we build object files in this directory.
+CC_ALL=$(INCLUDES) $(DEFS) $(CPPFLAGS) $(CFLAGS) $(X_CFLAGS)
 .c.o:
-	$(CC) -c $(INCLUDES) $(DEFS) $(CPPFLAGS) $(CFLAGS) $(X_CFLAGS) $<
-
+	$(CC) -c $(CC_ALL) $<
 .m.o:
-	$(OBJCC) -c $(INCLUDES) $(DEFS) $(CPPFLAGS) $(CFLAGS) $(X_CFLAGS) $<
+	$(OBJCC) -c $(CC_ALL) $<
 
 # subprocs takes an extra -D option.
 subprocs.o: subprocs.c
-	$(CC) -c $(INCLUDES) $(SUBP_DEFS) $(CPPFLAGS) $(CFLAGS) $(X_CFLAGS) \
-	  $(srcdir)/subprocs.c
+	$(CC) -c $(CC_ALL) $(SUBP_DEFS) $(srcdir)/subprocs.c
 
 # xscreensaver takes an extra -D option.
 xscreensaver.o: xscreensaver.c
-	$(CC) -c $(INCLUDES) $(DEFS) $(INTL_DEFS) $(CPPFLAGS) $(CFLAGS) $(X_CFLAGS) \
-	  $(srcdir)/xscreensaver.c
+	$(CC) -c $(CC_ALL) $(INTL_DEFS) $(srcdir)/xscreensaver.c
 
-# demo-Gtk takes extra -D options, and an extra -I option.
+# demo-Gtk and demo-Gtk-conf take extra -D and -I options.
+DEMO_GTK=$(CONF_DEFS) $(SUBP_DEFS) $(GTK_DEFS) $(INTL_DEFS) -I$(ICON_SRC)
 demo-Gtk.o: demo-Gtk.c
-	$(CC) -c $(INCLUDES) $(SUBP_DEFS) -I$(ICON_SRC) \
-	  $(GTK_DEFS) $(INTL_DEFS) $(CPPFLAGS) $(CFLAGS) $(X_CFLAGS) \
-	  $(srcdir)/demo-Gtk.c
-
-# demo-Gtk-conf takes an extra -D option.
+	$(CC) -c $(CC_ALL) $(DEMO_GTK) $(srcdir)/demo-Gtk.c
 demo-Gtk-conf.o: demo-Gtk-conf.c
-	$(CC) -c $(INCLUDES) $(CONF_DEFS) $(GTK_DEFS) $(CPPFLAGS) $(CFLAGS) $(X_CFLAGS) \
-	  $(srcdir)/demo-Gtk-conf.c
+	$(CC) -c $(CC_ALL) $(DEMO_GTK) $(srcdir)/demo-Gtk-conf.c
 
 
 # How we build the default app-defaults file into the program.
@@ -808,15 +809,15 @@ xscreensaver-demo: @PREFERRED_DEMO_PROGRAM@
 	       cp -p @PREFERRED_DEMO_PROGRAM@@EXEEXT@ $@@EXEEXT@      ;	\
 	fi
 
+DEMO_XM_CC=$(DEMO_OBJS) $(MOTIF_OBJS) $(LIBS) $(X_LIBS) $(MOTIF_LIBS)
+DEMO_GTK_CC=$(DEMO_OBJS) $(GTK_OBJS)  $(LIBS) $(X_LIBS) $(GTK_LIBS) $(XML_LIBS)
+DEMO_CC2=$(INTL_LIBS) $(X_PRE_LIBS) -lXt -lX11 $(XDPMS_LIBS) $(XINERAMA_LIBS)
+DEMO_CC3=-lXext $(X_EXTRA_LIBS)
 xscreensaver-demo-Xm: $(DEMO_OBJS) $(MOTIF_OBJS)
-	$(CC) $(LDFLAGS) -o $@ $(DEMO_OBJS) $(MOTIF_OBJS) $(LIBS) $(X_LIBS) \
-	$(MOTIF_LIBS) $(INTL_LIBS) $(X_PRE_LIBS) -lXt -lX11 \
-	$(XDPMS_LIBS) $(XINERAMA_LIBS) -lXext $(X_EXTRA_LIBS)
+	$(CC) $(LDFLAGS) -o $@ $(DEMO_XM_CC)  $(DEMO_CC2) $(DEMO_CC3)
 
 xscreensaver-demo-Gtk: $(DEMO_OBJS) $(GTK_OBJS)
-	$(CC) $(LDFLAGS) -o $@ $(DEMO_OBJS) $(GTK_OBJS) $(LIBS) $(X_LIBS) \
-	$(GTK_LIBS) $(XML_LIBS) $(INTL_LIBS) $(X_PRE_LIBS) \
-	-lXt -lX11 $(XDPMS_LIBS) $(XINERAMA_LIBS) -lXext $(X_EXTRA_LIBS)
+	$(CC) $(LDFLAGS) -o $@ $(DEMO_GTK_CC) $(DEMO_CC2) $(DEMO_CC3)
 
 demo-Gtk.o: XScreenSaver_ad.h
 demo-Xm.o:  XScreenSaver_Xm_ad.h
@@ -1042,6 +1043,10 @@ xscreensaver.o: $(UTILS_SRC)/version.h
 xscreensaver.o: $(UTILS_SRC)/visual.h
 xscreensaver.o: $(UTILS_SRC)/yarandom.h
 xscreensaver.o: $(srcdir)/xscreensaver.h
+xscreensaver-systemd.o: ../config.h
+xscreensaver-systemd.o: $(UTILS_SRC)/queue.h
+xscreensaver-systemd.o: $(UTILS_SRC)/version.h
+xscreensaver-systemd.o: $(UTILS_SRC)/yarandom.h
 xset.o: ../config.h
 xset.o: $(srcdir)/prefs.h
 xset.o: $(srcdir)/types.h
diff --git a/driver/XScreenSaver.ad.in b/driver/XScreenSaver.ad.in
index 0b51f0c..8eb0b63 100644
--- a/driver/XScreenSaver.ad.in
+++ b/driver/XScreenSaver.ad.in
@@ -4,8 +4,8 @@
 !            a screen saver and locker for the X window system
 !                            by Jamie Zawinski
 !
-!                              version 5.44
-!                              20-Mar-2020
+!                              version 5.45
+!                              08-Dec-2020
 !
 ! See "man xscreensaver" for more info.  The latest version is always
 ! available at https://www.jwz.org/xscreensaver/
@@ -589,8 +589,12 @@ XScreenSaver.bourneShell:		/bin/sh
 				vfeedback -root				    \n\
 @GL_KLUDGE@ GL: 				deepstars -root				    \n\
 @GL_KLUDGE@ GL: 				gravitywell -root			    \n\
+@GL_KLUDGE@ GL: 				beats -root				    \n\
+@GL_KLUDGE@ GL: 				covid19 -root				    \n\
 @GL_KLUDGE@ GL: 				etruscanvenus -root			    \n\
-@GL_KLUDGE@ GL: 				gibson -root				    \n
+@GL_KLUDGE@ GL: 				gibson -root				    \n\
+@GL_KLUDGE@ GL: 				headroom -root				    \n\
+@GL_KLUDGE@ GL: 				sphereeversion -root			    \n
 
 
 
@@ -615,6 +619,7 @@ XScreenSaver.bourneShell:		/bin/sh
 *hacks.ccurve.name:         CCurve
 *hacks.cloudlife.name:      CloudLife
 *hacks.companioncube.name:  CompanionCube
+*hacks.covid19.name:        COVID19
 *hacks.cubestack.name:      CubeStack
 *hacks.cubestorm.name:      CubeStorm
 *hacks.cubetwist.name:      CubeTwist
@@ -676,6 +681,7 @@ XScreenSaver.bourneShell:		/bin/sh
 *hacks.skytentacles.name:   SkyTentacles
 *hacks.slidescreen.name:    SlideScreen
 *hacks.speedmine.name:      SpeedMine
+*hacks.sphereeversion.name: SphereEversion
 *hacks.splitflap.name:      SplitFlap
 *hacks.starwars.name:       StarWars
 *hacks.stonerview.name:     StonerView
diff --git a/driver/demo-Gtk-conf.c b/driver/demo-Gtk-conf.c
index bac6ecc..cc3b6a3 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-2014 Jamie Zawinski <jwz@jwz.org>
+ * xscreensaver, Copyright (c) 2001-2020 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
@@ -59,8 +59,21 @@
 # endif /* LIBXML_VERSION */
 #endif /* xmlChildrenNode */
 
+#if (__GNUC__ >= 4)	/* Ignore useless warnings generated by gtk.h */
+# undef inline
+# pragma GCC diagnostic push
+# pragma GCC diagnostic ignored "-Wstrict-prototypes"
+# pragma GCC diagnostic ignored "-Wlong-long"
+# pragma GCC diagnostic ignored "-Wvariadic-macros"
+# pragma GCC diagnostic ignored "-Wpedantic"
+#endif
+
 #include <gtk/gtk.h>
 
+#if (__GNUC__ >= 4)
+# pragma GCC diagnostic pop
+#endif
+
 #include "demo-Gtk-conf.h"
 
 /* Deal with deprecation of direct access to struct fields on the way to GTK3
diff --git a/driver/demo-Gtk.c b/driver/demo-Gtk.c
index da98c53..c938ef2 100644
--- a/driver/demo-Gtk.c
+++ b/driver/demo-Gtk.c
@@ -82,6 +82,15 @@
 # include <X11/extensions/Xinerama.h>
 #endif /* HAVE_XINERAMA */
 
+#if (__GNUC__ >= 4)	/* Ignore useless warnings generated by gtk.h */
+# undef inline
+# pragma GCC diagnostic push
+# pragma GCC diagnostic ignored "-Wstrict-prototypes"
+# pragma GCC diagnostic ignored "-Wlong-long"
+# pragma GCC diagnostic ignored "-Wvariadic-macros"
+# pragma GCC diagnostic ignored "-Wpedantic"
+#endif
+
 #include <gtk/gtk.h>
 
 #ifdef HAVE_CRAPPLET
@@ -92,25 +101,20 @@
 #include <gdk/gdkx.h>
 
 #ifdef HAVE_GTK2
-# include <glade/glade-xml.h>
 # include <gmodule.h>
 #else  /* !HAVE_GTK2 */
 # define G_MODULE_EXPORT /**/
 #endif /* !HAVE_GTK2 */
 
-#if defined(DEFAULT_ICONDIR) && !defined(GLADE_DIR)
-# define GLADE_DIR DEFAULT_ICONDIR
-#endif
-#if !defined(DEFAULT_ICONDIR) && defined(GLADE_DIR)
-# define DEFAULT_ICONDIR GLADE_DIR
-#endif
-
 #ifndef HAVE_XML
  /* Kludge: this is defined in demo-Gtk-conf.c when HAVE_XML.
     It is unused otherwise, so in that case, stub it out. */
  static const char *hack_configuration_path = 0;
 #endif
 
+#if (__GNUC__ >= 4)
+# pragma GCC diagnostic pop
+#endif
 
 
 #include "version.h"
@@ -208,7 +212,7 @@ typedef struct {
   conf_data *cdata;		/* private data for per-hack configuration */
 
 #ifdef HAVE_GTK2
-  GladeXML *glade_ui;           /* Glade UI file */
+  GtkBuilder *gtk_ui;           /* UI file */
 #endif /* HAVE_GTK2 */
 
   Bool debug_p;			/* whether to print diagnostics */
@@ -272,16 +276,15 @@ static void kill_preview_subproc (state *, Bool reset_p);
 static void schedule_preview_check (state *);
 
 
-/* Prototypes of functions used by the Glade-generated code,
-   to avoid warnings.
+/* Prototypes of functions used by the Gtk-generated code, to avoid warnings.
  */
-void exit_menu_cb (GtkMenuItem *, gpointer user_data);
-void about_menu_cb (GtkMenuItem *, gpointer user_data);
-void doc_menu_cb (GtkMenuItem *, gpointer user_data);
-void file_menu_cb (GtkMenuItem *, gpointer user_data);
-void activate_menu_cb (GtkMenuItem *, gpointer user_data);
-void lock_menu_cb (GtkMenuItem *, gpointer user_data);
-void kill_menu_cb (GtkMenuItem *, gpointer user_data);
+void exit_menu_cb (GtkAction *, gpointer user_data);
+void about_menu_cb (GtkAction *, gpointer user_data);
+void doc_menu_cb (GtkAction *, gpointer user_data);
+void file_menu_cb (GtkAction *, gpointer user_data);
+void activate_menu_cb (GtkAction *, gpointer user_data);
+void lock_menu_cb (GtkAction *, gpointer user_data);
+void kill_menu_cb (GtkAction *, gpointer user_data);
 void restart_menu_cb (GtkWidget *, gpointer user_data);
 void run_this_cb (GtkButton *, gpointer user_data);
 void manual_cb (GtkButton *, gpointer user_data);
@@ -339,38 +342,49 @@ name_to_widget (state *s, const char *name)
   if (!*name) abort();
 
 #ifdef HAVE_GTK2
-  if (!s->glade_ui)
+  if (!s->gtk_ui)
     {
-      /* First try to load the Glade file from the current directory;
+      /* First try to load the UI file from the current directory;
          if there isn't one there, check the installed directory.
        */
-# define GLADE_FILE_NAME "xscreensaver-demo.glade2"
-      const char * const files[] = { GLADE_FILE_NAME,
-                                     GLADE_DIR "/" GLADE_FILE_NAME };
+# define UI_FILE "xscreensaver-demo.ui"
+      const char * const files[] = { UI_FILE,
+                                     DEFAULT_ICONDIR "/" UI_FILE };
       int i;
+
+      s->gtk_ui = gtk_builder_new ();
+
       for (i = 0; i < countof (files); i++)
         {
           struct stat st;
           if (!stat (files[i], &st))
             {
-              s->glade_ui = glade_xml_new (files[i], NULL, NULL);
-              break;
+              GError* error = NULL;
+
+              if (gtk_builder_add_from_file (s->gtk_ui, files[i], &error))
+                break;
+              else
+                {
+                  g_warning ("Couldn't load builder file %s: %s",
+			     files[i], error->message);
+                  g_error_free (error);
+                }
             }
         }
-      if (!s->glade_ui)
+      if (i >= countof (files))
 	{
 	  fprintf (stderr,
-                   "%s: could not load \"" GLADE_FILE_NAME "\"\n"
-                   "\tfrom " GLADE_DIR "/ or current directory.\n",
+                   "%s: could not load \"" UI_FILE "\"\n"
+                   "\tfrom " DEFAULT_ICONDIR "/ or current directory.\n",
                    blurb());
           exit (-1);
 	}
-# undef GLADE_FILE_NAME
+# undef UI_FILE
 
-      glade_xml_signal_autoconnect (s->glade_ui);
+      gtk_builder_connect_signals (s->gtk_ui, NULL);
     }
 
-  w = glade_xml_get_widget (s->glade_ui, name);
+  w = GTK_WIDGET (gtk_builder_get_object (s->gtk_ui, name));
 
 #else /* !HAVE_GTK2 */
 
@@ -382,7 +396,7 @@ name_to_widget (state *s, const char *name)
 #endif /* HAVE_GTK2 */
   if (w) return w;
 
-  fprintf (stderr, "%s: no widget \"%s\" (wrong Glade file?)\n",
+  fprintf (stderr, "%s: no widget \"%s\" (wrong UI file?)\n",
            blurb(), name);
   abort();
 }
@@ -774,12 +788,12 @@ run_hack (state *s, int list_elt, Bool report_errors_p)
 /* Button callbacks
 
    According to Eric Lassauge, this G_MODULE_EXPORT crud is needed to make
-   libglade work on Cygwin; apparently all Glade callbacks need this magic
-   extra declaration.  I do not pretend to understand.
+   GTK work on Cygwin; apparently all GTK callbacks need this magic extra
+   declaration.  I do not pretend to understand.
  */
 
 G_MODULE_EXPORT void
-exit_menu_cb (GtkMenuItem *menuitem, gpointer user_data)
+exit_menu_cb (GtkAction *menu_action, gpointer user_data)
 {
   state *s = global_state_kludge;  /* I hate C so much... */
   flush_dialog_changes_and_save (s);
@@ -798,7 +812,7 @@ wm_toplevel_close_cb (GtkWidget *widget, GdkEvent *event, gpointer data)
 
 
 G_MODULE_EXPORT void
-about_menu_cb (GtkMenuItem *menuitem, gpointer user_data)
+about_menu_cb (GtkAction *menu_action, gpointer user_data)
 {
   char msg [2048];
   char *vers = strdup (screensaver_id + 4);
@@ -819,7 +833,7 @@ about_menu_cb (GtkMenuItem *menuitem, gpointer user_data)
 
   /* Ole Laursen <olau@hardworking.dk> says "don't use _() here because
      non-ASCII characters aren't allowed in localizable string keys."
-     (I don't want to just use (c) instead of � because that doesn't
+     (I don't want to just use (c) instead of © because that doesn't
      look as good in the plain-old default Latin1 "C" locale.)
    */
 #ifdef HAVE_GTK2
@@ -851,7 +865,8 @@ about_menu_cb (GtkMenuItem *menuitem, gpointer user_data)
 
     GtkWidget *dialog = gtk_dialog_new ();
     GtkWidget *hbox, *icon, *vbox, *label1, *label2, *hb, *ok;
-    GtkWidget *parent = GTK_WIDGET (menuitem);
+    GSList *proxies = gtk_action_get_proxies (menu_action);
+    GtkWidget *parent = GTK_WIDGET (proxies->data);
     while (GET_PARENT (parent))
       parent = GET_PARENT (parent);
 
@@ -932,7 +947,7 @@ about_menu_cb (GtkMenuItem *menuitem, gpointer user_data)
 
 
 G_MODULE_EXPORT void
-doc_menu_cb (GtkMenuItem *menuitem, gpointer user_data)
+doc_menu_cb (GtkAction *menu_action, gpointer user_data)
 {
   state *s = global_state_kludge;  /* I hate C so much... */
   saver_preferences *p = &s->prefs;
@@ -960,7 +975,7 @@ doc_menu_cb (GtkMenuItem *menuitem, gpointer user_data)
 
 
 G_MODULE_EXPORT void
-file_menu_cb (GtkMenuItem *menuitem, gpointer user_data)
+file_menu_cb (GtkAction *menu_action, gpointer user_data)
 {
   state *s = global_state_kludge;  /* I hate C so much... */
   sensitize_menu_items (s, False);
@@ -968,7 +983,7 @@ file_menu_cb (GtkMenuItem *menuitem, gpointer user_data)
 
 
 G_MODULE_EXPORT void
-activate_menu_cb (GtkMenuItem *menuitem, gpointer user_data)
+activate_menu_cb (GtkAction *menu_action, gpointer user_data)
 {
   state *s = global_state_kludge;  /* I hate C so much... */
   run_cmd (s, XA_ACTIVATE, 0);
@@ -976,7 +991,7 @@ activate_menu_cb (GtkMenuItem *menuitem, gpointer user_data)
 
 
 G_MODULE_EXPORT void
-lock_menu_cb (GtkMenuItem *menuitem, gpointer user_data)
+lock_menu_cb (GtkAction *menu_action, gpointer user_data)
 {
   state *s = global_state_kludge;  /* I hate C so much... */
   run_cmd (s, XA_LOCK, 0);
@@ -984,7 +999,7 @@ lock_menu_cb (GtkMenuItem *menuitem, gpointer user_data)
 
 
 G_MODULE_EXPORT void
-kill_menu_cb (GtkMenuItem *menuitem, gpointer user_data)
+kill_menu_cb (GtkAction *menu_action, gpointer user_data)
 {
   state *s = global_state_kludge;  /* I hate C so much... */
   run_cmd (s, XA_EXIT, 0);
@@ -1191,7 +1206,7 @@ force_list_select_item (state *s, GtkWidget *list, int list_elt, Bool scroll_p)
   if (!was) gtk_widget_set_sensitive (parent, True);
 #ifdef HAVE_GTK2
   model = gtk_tree_view_get_model (GTK_TREE_VIEW (list));
-  g_assert (model);
+  if (!model) abort();
   if (gtk_tree_model_iter_nth_child (model, &iter, NULL, list_elt))
     {
       selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (list));
@@ -1634,11 +1649,8 @@ flush_dialog_changes_and_save (state *s)
 
   /* Map the mode menu to `saver_mode' enum values. */
   {
-    GtkOptionMenu *opt = GTK_OPTION_MENU (name_to_widget (s, "mode_menu"));
-    GtkMenu *menu = GTK_MENU (gtk_option_menu_get_menu (opt));
-    GtkWidget *selected = gtk_menu_get_active (menu);
-    GList *kids = gtk_container_children (GTK_CONTAINER (menu));
-    int menu_elt = g_list_index (kids, (gpointer) selected);
+    GtkComboBox *opt = GTK_COMBO_BOX (name_to_widget (s, "mode_menu"));
+    int menu_elt = gtk_combo_box_get_active (opt);
     if (menu_elt < 0 || menu_elt >= countof(mode_menu_order)) abort();
     p2->mode = mode_menu_order[menu_elt];
   }
@@ -1744,9 +1756,10 @@ flush_popup_changes_and_save (state *s)
   int list_elt = selected_list_element (s);
 
   GtkEntry *cmd = GTK_ENTRY (name_to_widget (s, "cmd_text"));
-  GtkCombo *vis = GTK_COMBO (name_to_widget (s, "visual_combo"));
+  GtkComboBoxEntry *vis = GTK_COMBO_BOX_ENTRY (name_to_widget (s, "visual_combo"));
+  GtkEntry *visent = GTK_ENTRY (gtk_bin_get_child (GTK_BIN (vis)));
 
-  const char *visual = gtk_entry_get_text (GTK_ENTRY (GTK_COMBO (vis)->entry));
+  const char *visual = gtk_entry_get_text (visent);
   const char *command = gtk_entry_get_text (cmd);
 
   char c;
@@ -1791,7 +1804,7 @@ flush_popup_changes_and_save (state *s)
     {
       gdk_beep ();				  /* unparsable */
       visual = "";
-      gtk_entry_set_text (GTK_ENTRY (GTK_COMBO (vis)->entry), _("Any"));
+      gtk_entry_set_text (visent, _("Any"));
     }
 
   changed = flush_changes (s, list_elt, -1, command, visual);
@@ -1839,21 +1852,8 @@ mode_menu_item_cb (GtkWidget *widget, gpointer user_data)
   GtkWidget *list = name_to_widget (s, "list");
   int list_elt;
 
-  GList *menu_items =
-    gtk_container_children (GTK_CONTAINER (GET_PARENT (widget)));
-  int menu_index = 0;
-  saver_mode new_mode;
-
-  while (menu_items)
-    {
-      if (menu_items->data == widget)
-        break;
-      menu_index++;
-      menu_items = menu_items->next;
-    }
-  if (!menu_items) abort();
-
-  new_mode = mode_menu_order[menu_index];
+  int menu_index = gtk_combo_box_get_active (GTK_COMBO_BOX (widget));
+  saver_mode new_mode = mode_menu_order[menu_index];
 
   /* Keep the same list element displayed as before; except if we're
      switching *to* "one screensaver" mode from any other mode, set
@@ -1901,7 +1901,7 @@ list_activated_cb (GtkTreeView       *list,
   char *str;
   int list_elt;
 
-  g_return_if_fail (!gdk_pointer_is_grabbed ());
+  if (gdk_pointer_is_grabbed()) return;
 
   str = gtk_tree_path_to_string (path);
   list_elt = strtol (str, NULL, 10);
@@ -2868,13 +2868,13 @@ populate_prefs_page (state *s)
 
   /* Map the `saver_mode' enum to mode menu to values. */
   {
-    GtkOptionMenu *opt = GTK_OPTION_MENU (name_to_widget (s, "mode_menu"));
+    GtkComboBox *opt = GTK_COMBO_BOX (name_to_widget (s, "mode_menu"));
 
     int i;
     for (i = 0; i < countof(mode_menu_order); i++)
       if (mode_menu_order[i] == p->mode)
         break;
-    gtk_option_menu_set_history (opt, i);
+    gtk_combo_box_set_active (opt, i);
     update_list_sensitivity (s);
   }
 
@@ -3022,7 +3022,7 @@ sensitize_menu_items (state *s, Bool force_p)
   static Bool running_p = False;
   static time_t last_checked = 0;
   time_t now = time ((time_t *) 0);
-  const char *names[] = { "activate_menu", "lock_menu", "kill_menu",
+  const char *names[] = { "activate_action", "lock_action", "kill_action",
                           /* "demo" */ };
   int i;
 
@@ -3034,8 +3034,8 @@ sensitize_menu_items (state *s, Bool force_p)
 
   for (i = 0; i < countof(names); i++)
     {
-      GtkWidget *w = name_to_widget (s, names[i]);
-      gtk_widget_set_sensitive (GTK_WIDGET(w), running_p);
+      GtkAction *a = GTK_ACTION (gtk_builder_get_object (s->gtk_ui, names[i]));
+      gtk_action_set_sensitive (a, running_p);
     }
 }
 
@@ -3107,7 +3107,7 @@ fix_text_entry_sizes (state *s)
   /* Now fix the width of the combo box.
    */
   w = GTK_WIDGET (name_to_widget (s, "visual_combo"));
-  w = GTK_COMBO (w)->entry;
+  w = GTK_COMBO_BOX_ENTRY (w)->entry;
   width = gdk_string_width (w->style->font, "PseudoColor___");
   gtk_widget_set_usize (w, width, -2);
 
@@ -3313,7 +3313,7 @@ populate_demo_window (state *s, int list_elt)
   GtkFrame *frame1 = GTK_FRAME (name_to_widget (s, "preview_frame"));
   GtkFrame *frame2 = GTK_FRAME (name_to_widget (s, "opt_frame"));
   GtkEntry *cmd    = GTK_ENTRY (name_to_widget (s, "cmd_text"));
-  GtkCombo *vis    = GTK_COMBO (name_to_widget (s, "visual_combo"));
+  GtkComboBoxEntry *vis = GTK_COMBO_BOX_ENTRY (name_to_widget (s, "visual_combo"));
   GtkWidget *list  = GTK_WIDGET (name_to_widget (s, "list"));
 
   if (p->mode == BLANK_ONLY)
@@ -3363,7 +3363,7 @@ populate_demo_window (state *s, int list_elt)
     gtk_window_set_title (GTK_WINDOW (s->popup_widget), title);
   }
 
-  gtk_entry_set_text (GTK_ENTRY (GTK_COMBO (vis)->entry),
+  gtk_entry_set_text (GTK_ENTRY (gtk_bin_get_child (GTK_BIN (vis))),
                       (hack
                        ? (hack->visual && *hack->visual
                           ? hack->visual
@@ -5171,31 +5171,32 @@ main (int argc, char **argv)
 #endif /* !HAVE_GTK2 */
 
   /* Hook up callbacks to the items on the mode menu. */
-  {
-    GtkOptionMenu *opt = GTK_OPTION_MENU (name_to_widget (s, "mode_menu"));
-    GtkMenu *menu = GTK_MENU (gtk_option_menu_get_menu (opt));
-    GList *kids = gtk_container_children (GTK_CONTAINER (menu));
-    int i;
-    for (i = 0; kids; kids = kids->next, i++)
-      {
-        gtk_signal_connect (GTK_OBJECT (kids->data), "activate",
-                            GTK_SIGNAL_FUNC (mode_menu_item_cb),
-                            (gpointer) s);
-
-        /* The "random-same" mode menu item does not appear unless
-           there are multple screens.
-         */
-        if (s->nscreens <= 1 &&
-            mode_menu_order[i] == RANDOM_HACKS_SAME)
-          gtk_widget_hide (GTK_WIDGET (kids->data));
-      }
+  gtk_signal_connect (GTK_OBJECT (name_to_widget (s, "mode_menu")),
+                      "changed", GTK_SIGNAL_FUNC (mode_menu_item_cb),
+                      (gpointer) s);
+  if (s->nscreens <= 1)
+    {
+      GtkComboBox *opt = GTK_COMBO_BOX (name_to_widget (s, "mode_menu"));
+      GtkTreeModel *list = gtk_combo_box_get_model (opt);
+      unsigned int i;
+      for (i = 0; i < countof(mode_menu_order); i++)
+        {
+          /* The "random-same" mode menu item does not appear unless
+             there are multiple screens.
+           */
+          if (mode_menu_order[i] == RANDOM_HACKS_SAME)
+            {
+              GtkTreeIter iter;
+              gtk_tree_model_iter_nth_child (list, &iter, NULL, i);
+              gtk_list_store_remove (GTK_LIST_STORE (list), &iter);
+              break;
+            }
+        }
 
-    if (s->nscreens <= 1)   /* recompute option-menu size */
-      {
-        gtk_widget_unrealize (GTK_WIDGET (menu));
-        gtk_widget_realize (GTK_WIDGET (menu));
-      }
-  }
+        /* recompute option-menu size */
+        gtk_widget_unrealize (GTK_WIDGET (opt));
+        gtk_widget_realize (GTK_WIDGET (opt));
+    }
 
 
   /* Handle the -prefs command-line argument. */
diff --git a/driver/lock.c b/driver/lock.c
index d36481e..8bcd2e0 100644
--- a/driver/lock.c
+++ b/driver/lock.c
@@ -1,5 +1,5 @@
 /* lock.c --- handling the password dialog for locking-mode.
- * xscreensaver, Copyright (c) 1993-2018 Jamie Zawinski <jwz@jwz.org>
+ * xscreensaver, Copyright (c) 1993-2020 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
@@ -1928,6 +1928,15 @@ passwd_event_loop (saver_info *si)
 	  if (si->pw_data->login_button_p)
 	    handle_login_button (si, &event.x_event);
 	}
+      else if (event.x_event.xany.type == ClientMessage &&
+               event.x_event.xclient.message_type == XA_SCREENSAVER &&
+               event.x_event.xclient.format == 32)
+        {
+          const char *msg =
+            "ClientMessage ignored while authentication dialog is active";
+          clientmessage_response (si, event.x_event.xclient.window,
+                                  True, msg, msg);
+        }
       else
 	XtDispatchEvent (&event.x_event);
     }
diff --git a/driver/passwd-pam.c b/driver/passwd-pam.c
index d463bc2..457fed5 100644
--- a/driver/passwd-pam.c
+++ b/driver/passwd-pam.c
@@ -131,7 +131,7 @@ Bool pam_priv_init (int argc, char **argv, Bool verbose_p);
    set up an "xscreensaver" PAM service.  However, if we went that route,
    it would have a really awful failure mode: the failure mode would be that
    xscreensaver was willing to *lock* the screen, but would be unwilling to
-   *unlock* the screen.  (With the non-PAM password code, the analagous
+   *unlock* the screen.  (With the non-PAM password code, the analogous
    situation -- security not being configured properly, for example do to the
    executable not being installed as setuid root -- the failure mode is much
    more palettable, in that xscreensaver will refuse to *lock* the screen,
diff --git a/driver/pdf2jpeg.m b/driver/pdf2jpeg.m
index d681b4a..a9975e8 100644
--- a/driver/pdf2jpeg.m
+++ b/driver/pdf2jpeg.m
@@ -138,7 +138,7 @@ main (int argc, char** argv)
                           dictionaryWithObject:
                             [NSNumber numberWithFloat:compression]
                           forKey:NSImageCompressionFactor];
-  NSData *jpeg_data = [bit_rep representationUsingType:NSJPEGFileType
+  NSData *jpeg_data = [bit_rep representationUsingType:NSBitmapImageFileTypeJPEG
                                properties:props];
 
   [jpeg_data writeToFile:
diff --git a/driver/prefs.c b/driver/prefs.c
index b608738..8c8c19a 100644
--- a/driver/prefs.c
+++ b/driver/prefs.c
@@ -971,7 +971,9 @@ write_init_file (Display *dpy,
 
 	  /* Since the .xscreensaver file is used for IPC, let's try and make
 	     sure that the bits actually land on the disk right away. */
-	  sync ();
+          /* Update 2020: Apparently here in the future, this sometimes takes
+             3+ seconds, so let's not. */
+	  /* sync(); */
 
           status = 0;    /* wrote and renamed successfully! */
 	}
@@ -1779,5 +1781,5 @@ senesculent_p (void)
   mrnths = ((((tm->tm_year + 1900) * 12) + tm->tm_mon) -	/*   h   */
             (y * 12 + m));					/*   h   */
 							  	/*   p   */
-  return (mrnths >= 34);					/*   .   */
+  return (mrnths >= 44);					/*   .   */
 }
diff --git a/driver/remote.c b/driver/remote.c
index 83254e0..218aa6a 100644
--- a/driver/remote.c
+++ b/driver/remote.c
@@ -1,4 +1,4 @@
-/* xscreensaver-command, Copyright (c) 1991-2019 Jamie Zawinski <jwz@jwz.org>
+/* xscreensaver-command, Copyright (c) 1991-2020 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
@@ -551,7 +551,7 @@ xscreensaver_command_wait_for_blank (Display *dpy, Window window,
         }
       else if (xgwa.map_state == IsViewable)
         {
-          if (verbose_p)
+          if (verbose_p > 1)
             fprintf (stderr, "%s: window 0x%08x mapped.\n",
                      progname, (unsigned int) window);
           return 0;
@@ -570,10 +570,11 @@ xscreensaver_command_wait_for_blank (Display *dpy, Window window,
                 fprintf (stderr, "%s: %s\n", progname, err);
               return -1;
             }
-          else if (verbose_p && now > start+1)
+          else if (verbose_p && now > start + 3)
             {
               fprintf (stderr, "%s: waiting for window 0x%08x to map\n",
                        progname, (unsigned int) window);
+              verbose_p++;
             }
         }
 
@@ -681,11 +682,12 @@ server_xscreensaver_version (Display *dpy,
 	    {
 	      char *o = 0, *p = 0, *c = 0;
 	      o = strchr ((char *) id, '(');
-	      if (o) p = strchr (o, '@');
+	      if (o) p = strrchr (o, '@');
 	      if (p) c = strchr (p, ')');
 	      if (c)
 		{
-		  /* found ID of the form "1234 (user@host)". */
+		  /* found ID of the form "1234 (user@host)"
+                     or the weirder "1234 (user@crap@host)". */
 		  user = o+1;
 		  host = p+1;
 		  *p = 0;
diff --git a/driver/screens.c b/driver/screens.c
index f319c96..5aeb55d 100644
--- a/driver/screens.c
+++ b/driver/screens.c
@@ -1,5 +1,5 @@
 /* screens.c --- dealing with RANDR, Xinerama, and VidMode Viewports.
- * xscreensaver, Copyright (c) 1991-2008 Jamie Zawinski <jwz@jwz.org>
+ * xscreensaver, Copyright (c) 1991-2020 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
@@ -1089,6 +1089,22 @@ update_screen_layout (saver_info *si)
       j++;
     }
 
+  for (; j < count; j++)
+    {
+      saver_screen_info *ssi = &si->screens[j];
+      if (!ssi->screensaver_window)
+        continue;
+      fprintf (stderr, "%s: %d: screen now unused, disabling.\n",
+               blurb(), j);
+      /* Undo store_saver_id() so that xscreensaver-command doesn't attempt
+         to communicate with us through this window. It might make more
+         sense to destroy the window, but I'm not 100% sure that there are
+         no outstanding grabs on it that have yet been transferred.
+       */
+      XDeleteProperty (si->dpy, ssi->screensaver_window,
+                       XA_SCREENSAVER_VERSION);
+    }
+
   si->default_screen = &si->screens[0];
   return True;
 }
diff --git a/driver/stderr.c b/driver/stderr.c
index 84fa697..140f6c1 100644
--- a/driver/stderr.c
+++ b/driver/stderr.c
@@ -1,5 +1,5 @@
 /* stderr.c --- capturing stdout/stderr output onto the screensaver window.
- * xscreensaver, Copyright (c) 1991-2016 Jamie Zawinski <jwz@jwz.org>
+ * xscreensaver, Copyright (c) 1991-2020 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
@@ -296,6 +296,7 @@ static void
 stderr_callback (XtPointer closure, int *fd, XtIntervalId *id)
 {
   saver_info *si = (saver_info *) closure;
+  Bool shutting_down_p = (id == 0);  /* Called from shutdown_stderr() */
   char *s;
   int left;
   int size;
@@ -345,7 +346,7 @@ stderr_callback (XtPointer closure, int *fd, XtIntervalId *id)
      However, if the buffer is full (meaning lots of data has been written)
      then we don't reset the timer.
    */
-  if (read_this_time > 0)
+  if (read_this_time > 0 && !shutting_down_p)
     {
       if (si->stderr_popup_timer)
 	XtRemoveTimeOut (si->stderr_popup_timer);
@@ -361,7 +362,7 @@ stderr_callback (XtPointer closure, int *fd, XtIntervalId *id)
    screen as well as on the original value of those streams.
  */
 void
-initialize_stderr (saver_info *si)
+initialize_stderr (saver_info *si, Bool inhibit_p)
 {
   static Boolean done = False;
   int fds [2];
@@ -378,6 +379,9 @@ initialize_stderr (saver_info *si)
   real_stderr = stderr;
   real_stdout = stdout;
 
+  if (inhibit_p)
+    return;
+
   stderr_dialog_p = get_boolean_resource (si->dpy, "captureStderr", "Boolean");
 
   if (!stderr_dialog_p)
@@ -476,8 +480,9 @@ initialize_stderr (saver_info *si)
 /* If the "-log file" command-line option has been specified,
    open the file for append, and redirect stdout/stderr there.
    This is called very early, before initialize_stderr().
+   Returns true if logging to a file.
  */
-void
+Bool
 stderr_log_file (saver_info *si)
 {
   int stdout_fd = 1;
@@ -485,7 +490,8 @@ stderr_log_file (saver_info *si)
   const char *filename = get_string_resource (si->dpy, "logFile", "LogFile");
   int fd;
 
-  if (!filename || !*filename) return;
+  if (!filename || !*filename)
+    return False;
 
   fd = open (filename, O_WRONLY | O_APPEND | O_CREAT, 0666);
 
@@ -511,6 +517,7 @@ stderr_log_file (saver_info *si)
  "##########################################################################\n"
            "\n",
            blurb(), filename, timestring(0));
+  return True;
 }
 
 
@@ -527,6 +534,7 @@ shutdown_stderr (saver_info *si)
   if (!real_stderr || stderr_stdout_read_fd < 0)
     return;
 
+  /* Copy any stragglers from the stderr pipe into stderr_buffer */
   stderr_callback ((XtPointer) si, &stderr_stdout_read_fd, 0);
 
   if (stderr_tail &&
diff --git a/driver/subprocs.c b/driver/subprocs.c
index 6cb96d3..d4d26ae 100644
--- a/driver/subprocs.c
+++ b/driver/subprocs.c
@@ -1,5 +1,5 @@
 /* subprocs.c --- choosing, spawning, and killing screenhacks.
- * xscreensaver, Copyright (c) 1991-2019 Jamie Zawinski <jwz@jwz.org>
+ * xscreensaver, Copyright (c) 1991-2020 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
@@ -62,7 +62,7 @@ extern int kill (pid_t, int);		/* signal() is in sys/signal.h... */
 #undef XtPointer
 #define XtAppContext void*
 #define XrmDatabase  void*
-#define XtIntervalId void*
+#define XtIntervalId unsigned long
 #define XtPointer    void*
 #define Widget       void*
 
@@ -369,7 +369,8 @@ find_job (pid_t pid)
 
 static void await_dying_children (saver_info *si);
 #ifndef VMS
-static void describe_dead_child (saver_info *, pid_t, int wait_status);
+static void describe_dead_child (saver_info *, pid_t, int wait_status,
+                                 struct rusage);
 #endif
 
 
@@ -561,9 +562,10 @@ await_dying_children (saver_info *si)
     {
       int wait_status = 0;
       pid_t kid;
+      struct rusage rus;
 
       errno = 0;
-      kid = waitpid (-1, &wait_status, WNOHANG|WUNTRACED);
+      kid = wait4 (-1, &wait_status, WNOHANG|WUNTRACED, &rus);
 
       if (si->prefs.debug_p)
 	{
@@ -600,13 +602,14 @@ await_dying_children (saver_info *si)
 	  (kid < 0 && errno != EINTR))
 	break;
 
-      describe_dead_child (si, kid, wait_status);
+      describe_dead_child (si, kid, wait_status, rus);
     }
 }
 
 
 static void
-describe_dead_child (saver_info *si, pid_t kid, int wait_status)
+describe_dead_child (saver_info *si, pid_t kid, int wait_status,
+                     struct rusage rus)
 {
   int i;
   saver_preferences *p = &si->prefs;
@@ -678,6 +681,10 @@ describe_dead_child (saver_info *si, pid_t kid, int wait_status)
 		   blurb(), screen_no, (unsigned long) kid, name,
 		   signal_name (WTERMSIG(wait_status)));
            */
+# ifdef LOG_CPU_TIME
+          long u_ms = rus.ru_utime.tv_usec / 1000 + rus.ru_utime.tv_sec * 1000;
+          long s_ms = rus.ru_stime.tv_usec / 1000 + rus.ru_stime.tv_sec * 1000;
+# endif /* LOG_CPU_TIME */
           write_string (STDERR_FILENO, blurb());
           write_string (STDERR_FILENO, ": ");
           write_long   (STDERR_FILENO, (long) screen_no);
@@ -688,6 +695,20 @@ describe_dead_child (saver_info *si, pid_t kid, int wait_status)
           write_string (STDERR_FILENO, ") terminated with signal ");
           write_long   (STDERR_FILENO, WTERMSIG(wait_status));
           write_string (STDERR_FILENO, ".\n");
+# ifdef LOG_CPU_TIME
+          write_string (STDERR_FILENO, blurb());
+          write_string (STDERR_FILENO, ": ");
+          write_long   (STDERR_FILENO, (long) screen_no);
+          write_string (STDERR_FILENO, ": CPU used: ");
+          write_long   (STDERR_FILENO, (u_ms / 1000));   /* msec -> sec */
+          write_string (STDERR_FILENO, ".");
+          write_long   (STDERR_FILENO, (u_ms % 1000) / 100);
+          write_string (STDERR_FILENO, "u, ");
+          write_long   (STDERR_FILENO, (s_ms / 1000));   /* msec -> sec */
+          write_string (STDERR_FILENO, ".");
+          write_long   (STDERR_FILENO, (s_ms % 1000) / 100);
+          write_string (STDERR_FILENO, "s.\n");
+# endif /* LOG_CPU_TIME */
         }
 
       if (job)
@@ -1468,9 +1489,25 @@ save_argv (int argc, char **argv)
 void
 restart_process (saver_info *si)
 {
-  fflush (stdout);
-  fflush (stderr);
-  shutdown_stderr (si);
+  if (si->screen_blanked_p)
+    {
+      unblank_screen (si);
+      XSync (si->dpy, False);
+    }
+
+  emergency_kill_subproc (si);
+
+# ifdef HAVE_LIBSYSTEMD
+  if (si->systemd_pid)  /* Kill background xscreensaver-systemd process */
+    {
+      /* We're exiting, so there's no need to do a full kill_job() here,
+         which would waitpid(). */
+      /* kill_job (si, si->systemd_pid, SIGTERM); */
+      kill (si->systemd_pid, SIGTERM);
+      si->systemd_pid = 0;
+    }
+# endif
+
   if (si->prefs.verbose_p)
     {
       int i;
@@ -1478,12 +1515,13 @@ restart_process (saver_info *si)
       for (i = 0; saved_argv[i]; i++)
 	fprintf (stderr, " %s", saved_argv[i]);
       fprintf (stderr, "\n");
+
+      describe_uids (si, stderr);
+      fprintf (stderr, "\n");
     }
-  describe_uids (si, stderr);
-  fprintf (stderr, "\n");
 
-  fflush (stdout);
-  fflush (stderr);
+  shutdown_stderr (si);
+
   execvp (saved_argv [0], saved_argv);	/* shouldn't return */
   {
     char buf [512];
diff --git a/driver/timers.c b/driver/timers.c
index b096000..17781eb 100644
--- a/driver/timers.c
+++ b/driver/timers.c
@@ -729,6 +729,9 @@ flush_events (saver_info *si)
       deactivated by clientmessage.
 
    I trust that explains why this function is a big hairy mess.
+
+   See the very long comment at the top of xscreensaver.c for why the
+   MIT-SCREEN-SAVER extension is garbage and should not be used.
  */
 void
 sleep_until_idle (saver_info *si, Bool until_idle_p)
diff --git a/driver/windows.c b/driver/windows.c
index c0e2291..f70e7cb 100644
--- a/driver/windows.c
+++ b/driver/windows.c
@@ -63,7 +63,7 @@ typedef long PROP32;
 #undef XtPointer
 #define XtAppContext void*
 #define XrmDatabase  void*
-#define XtIntervalId void*
+#define XtIntervalId unsigned long
 #define XtPointer    void*
 #define Widget       void*
 
@@ -774,24 +774,37 @@ static RETSIGTYPE
 restore_real_vroot_handler (int sig)
 {
   saver_info *si = global_si_kludge;	/* I hate C so much... */
+  Bool restored_p;
 
   signal (sig, SIG_DFL);
-  if (restore_real_vroot (si))
-    fprintf (real_stderr, "\n%s: %s intercepted, vroot restored.\n",
-	     blurb(), signal_name(sig));
+
 # ifdef HAVE_LIBSYSTEMD
   if (si->systemd_pid)  /* Kill background xscreensaver-systemd process */
     {
       /* We're exiting, so there's no need to do a full kill_job() here,
-         which will waitpid(). */
+         which would waitpid(). */
       /* kill_job (si, si->systemd_pid, SIGTERM); */
       kill (si->systemd_pid, SIGTERM);
       si->systemd_pid = 0;
     }
 # endif
+
+  /* This is a signal handler, and the following might do X protocol,
+     which is horrible, but we're about to terminate so we don't have
+     a choice... */
+  restored_p = restore_real_vroot (si);
+
+  /* Calling fprintf from a signal handler is also risky, but we're
+     so far into the weeds on that front already... */
+  fprintf (stderr, "\n%s: %s%s\n\n", blurb(), signal_name(sig),
+           (restored_p ? ", vroot restored" : ""));
+
+  shutdown_stderr (si);
+
   kill (getpid (), sig);
 }
 
+
 static void
 catch_signal (saver_info *si, int sig, RETSIGTYPE (*handler) (int))
 {
@@ -874,15 +887,6 @@ saver_sighup_handler (int sig)
   fprintf (stderr, "%s: %s received: restarting...\n",
            blurb(), signal_name(sig));
 
-  if (si->screen_blanked_p)
-    {
-      int i;
-      for (i = 0; i < si->nscreens; i++)
-        kill_screenhack (&si->screens[i]);
-      unblank_screen (si);
-      XSync (si->dpy, False);
-    }
-
   restart_process (si);   /* Does not return */
   abort ();
 }
@@ -898,17 +902,16 @@ saver_exit (saver_info *si, int status, const char *dump_core_reason)
   Bool vrs;
 
   if (exiting)
-    exit(status);
+    exit (status);
 
   exiting = True;
   
   vrs = restore_real_vroot (si);
-  emergency_kill_subproc (si);
-  shutdown_stderr (si);
-
   if (p->verbose_p && vrs)
     fprintf (real_stderr, "%s: old vroot restored.\n", blurb());
 
+  emergency_kill_subproc (si);
+
 # ifdef HAVE_LIBSYSTEMD
   if (si->systemd_pid)  /* Kill background xscreensaver-systemd process */
     {
@@ -917,12 +920,7 @@ saver_exit (saver_info *si, int status, const char *dump_core_reason)
     }
 # endif
 
-  fflush(real_stdout);
-
-#ifdef VMS	/* on VMS, 1 is the "normal" exit code instead of 0. */
-  if (status == 0) status = 1;
-  else if (status == 1) status = -1;
-#endif
+  shutdown_stderr (si);
 
   bugp = !!dump_core_reason;
 
@@ -960,6 +958,11 @@ saver_exit (saver_info *si, int status, const char *dump_core_reason)
       abort();
     }
 
+# ifdef VMS	/* on VMS, 1 is the "normal" exit code instead of 0. */
+  if (status == 0) status = 1;
+  else if (status == 1) status = -1;
+# endif
+
   exit (status);
 }
 
@@ -1322,7 +1325,11 @@ initialize_screensaver_window_1 (saver_screen_info *ssi)
 	 always exist (though the ID is constant.)  So to use this
 	 window, we'd have to reimplement the ACTIVATE ClientMessage to
 	 tell the *server* to tell *us* to turn on, to cause the window
-	 to get created at the right time.  Gag.  */
+	 to get created at the right time.  Gag.
+
+         See the very long comment at the top of xscreensaver.c for why the
+         MIT-SCREEN-SAVER extension is garbage and should not be used.
+       */
       XScreenSaverSetAttributes (si->dpy, root,
 				 0, 0, width, height, 0,
 				 current_depth, InputOutput, visual,
diff --git a/driver/xscreensaver-command.c b/driver/xscreensaver-command.c
index 4a4f0b4..e452112 100644
--- a/driver/xscreensaver-command.c
+++ b/driver/xscreensaver-command.c
@@ -1,4 +1,4 @@
-/* xscreensaver-command, Copyright (c) 1991-2019 Jamie Zawinski <jwz@jwz.org>
+/* xscreensaver-command, Copyright (c) 1991-2020 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
@@ -72,6 +72,9 @@ usage: %s -<option>\n\
   with this program, xscreensaver-command.  See the man pages for\n\
   details.  These are the arguments understood by xscreensaver-command:\n\
 \n\
+  -quiet        Only print output if an error occurs.\n\
+  -verbose      Opposite of -quiet. Default.\n\
+\n\
   -demo         Ask the xscreensaver process to enter interactive demo mode.\n\
 \n\
   -prefs        Ask the xscreensaver process to bring up the preferences\n\
@@ -166,6 +169,7 @@ main (int argc, char **argv)
   char *s;
   Atom XA_WATCH = 0;  /* kludge: not really an atom */
   char year[5];
+  Bool verbose_p = TRUE;
 
   progname = argv[0];
   s = strrchr (progname, '/');
@@ -208,6 +212,8 @@ main (int argc, char **argv)
       else if (!strncmp (s, "-version", L))    cmd = &XA_SCREENSAVER_VERSION;
       else if (!strncmp (s, "-time", L))       cmd = &XA_SCREENSAVER_STATUS;
       else if (!strncmp (s, "-watch", L))      cmd = &XA_WATCH;
+      else if (!strncmp (s, "-quiet", L))      verbose_p = FALSE;
+      else if (!strncmp (s, "-verbose", L))    verbose_p = TRUE;
       else USAGE ();
 
       if (cmd == &XA_SELECT || cmd == &XA_DEMO)
@@ -338,7 +344,7 @@ main (int argc, char **argv)
     if (isatty(0))
       sleep (1);
 
-  i = xscreensaver_command (dpy, *cmd, arg, True, NULL);
+  i = xscreensaver_command (dpy, *cmd, arg, verbose_p, NULL);
   if (i < 0) exit (i);
   else exit (0);
 }
diff --git a/driver/xscreensaver-command.man b/driver/xscreensaver-command.man
index 5837e5d..af5aaa6 100644
--- a/driver/xscreensaver-command.man
+++ b/driver/xscreensaver-command.man
@@ -32,7 +32,9 @@ xscreensaver-command - control a running xscreensaver process
 \-suspend | \
 \-version | \
 \-time | \
-\-watch]
+\-watch | \
+\-quiet | \
+\-verbose]
 .SH DESCRIPTION
 The \fIxscreensaver\-command\fP program controls a running \fIxscreensaver\fP
 process by sending it client-messages.
@@ -53,6 +55,12 @@ accepts the following command-line options:
 .B \-help
 Prints a brief summary of command-line options.
 .TP 8
+.B \-quiet
+Only print output if an error occurs.
+.TP 8
+.B \-verbose
+Opposite of \-quiet. Default.
+.TP 8
 .B \-demo
 This just launches the
 .BR xscreensaver\-demo (1)
@@ -256,7 +264,7 @@ and related tools can always be found at https://www.jwz.org/xscreensaver/
 .BR xscreensaver\-demo (1),
 .BR xset (1)
 .SH COPYRIGHT
-Copyright \(co 1992-2019 by Jamie Zawinski.
+Copyright \(co 1992-2020 by 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 the above copyright notice appear in all copies and that
diff --git a/driver/xscreensaver-demo.glade2.in b/driver/xscreensaver-demo.glade2.in
deleted file mode 100644
index ad0095d..0000000
--- a/driver/xscreensaver-demo.glade2.in
+++ /dev/null
@@ -1,3136 +0,0 @@
-<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
-<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
-
-<glade-interface>
-<requires lib="gnome"/>
-
-<widget class="GtkWindow" id="xscreensaver_demo">
-  <property name="title" translatable="yes">XScreenSaver</property>
-  <property name="type">GTK_WINDOW_TOPLEVEL</property>
-  <property name="window_position">GTK_WIN_POS_NONE</property>
-  <property name="modal">False</property>
-  <property name="resizable">True</property>
-  <property name="destroy_with_parent">False</property>
-  <property name="decorated">True</property>
-  <property name="skip_taskbar_hint">False</property>
-  <property name="skip_pager_hint">False</property>
-  <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
-  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
-  <property name="focus_on_map">True</property>
-  <property name="urgency_hint">False</property>
-
-  <child>
-    <widget class="GtkVBox" id="outer_vbox">
-      <property name="visible">True</property>
-      <property name="homogeneous">False</property>
-      <property name="spacing">5</property>
-
-      <child>
-	<widget class="GtkMenuBar" id="menubar">
-	  <property name="visible">True</property>
-	  <property name="pack_direction">GTK_PACK_DIRECTION_LTR</property>
-	  <property name="child_pack_direction">GTK_PACK_DIRECTION_LTR</property>
-
-	  <child>
-	    <widget class="GtkMenuItem" id="file">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">_File</property>
-	      <property name="use_underline">True</property>
-	      <signal name="activate" handler="file_menu_cb" last_modification_time="Sun, 06 Mar 2005 21:41:13 GMT"/>
-
-	      <child>
-		<widget class="GtkMenu" id="file_menu">
-
-		  <child>
-		    <widget class="GtkMenuItem" id="activate_menu">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">_Blank Screen Now</property>
-		      <property name="use_underline">True</property>
-		      <signal name="activate" handler="activate_menu_cb"/>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkMenuItem" id="lock_menu">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">_Lock Screen Now</property>
-		      <property name="use_underline">True</property>
-		      <signal name="activate" handler="lock_menu_cb"/>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkMenuItem" id="kill_menu">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">_Kill Daemon</property>
-		      <property name="use_underline">True</property>
-		      <signal name="activate" handler="kill_menu_cb"/>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkMenuItem" id="restart">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">_Restart Daemon</property>
-		      <property name="use_underline">True</property>
-		      <signal name="activate" handler="restart_menu_cb"/>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkMenuItem" id="separator1">
-		      <property name="visible">True</property>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkMenuItem" id="exit_menu">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">_Quit</property>
-		      <property name="use_underline">True</property>
-		      <signal name="activate" handler="exit_menu_cb"/>
-		    </widget>
-		  </child>
-		</widget>
-	      </child>
-	    </widget>
-	  </child>
-
-	  <child>
-	    <widget class="GtkMenuItem" id="help">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">_Help</property>
-	      <property name="use_underline">True</property>
-
-	      <child>
-		<widget class="GtkMenu" id="help_menu">
-
-		  <child>
-		    <widget class="GtkMenuItem" id="about_menu">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">_About...</property>
-		      <property name="use_underline">True</property>
-		      <signal name="activate" handler="about_menu_cb"/>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkMenuItem" id="doc_menu">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">_Documentation...</property>
-		      <property name="use_underline">True</property>
-		      <signal name="activate" handler="doc_menu_cb"/>
-		    </widget>
-		  </child>
-		</widget>
-	      </child>
-	    </widget>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">False</property>
-	  <property name="fill">False</property>
-	</packing>
-      </child>
-
-      <child>
-	<widget class="GtkHBox" id="spacer_hbox">
-	  <property name="border_width">8</property>
-	  <property name="visible">True</property>
-	  <property name="homogeneous">False</property>
-	  <property name="spacing">0</property>
-
-	  <child>
-	    <widget class="GtkNotebook" id="notebook">
-	      <property name="visible">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="show_tabs">True</property>
-	      <property name="show_border">True</property>
-	      <property name="tab_pos">GTK_POS_TOP</property>
-	      <property name="scrollable">False</property>
-	      <property name="enable_popup">False</property>
-	      <signal name="switch_page" handler="switch_page_cb"/>
-
-	      <child>
-		<widget class="GtkTable" id="demos_table">
-		  <property name="border_width">10</property>
-		  <property name="visible">True</property>
-		  <property name="n_rows">2</property>
-		  <property name="n_columns">2</property>
-		  <property name="homogeneous">False</property>
-		  <property name="row_spacing">0</property>
-		  <property name="column_spacing">0</property>
-
-		  <child>
-		    <widget class="GtkTable" id="blanking_table">
-		      <property name="visible">True</property>
-		      <property name="n_rows">3</property>
-		      <property name="n_columns">4</property>
-		      <property name="homogeneous">False</property>
-		      <property name="row_spacing">2</property>
-		      <property name="column_spacing">0</property>
-
-		      <child>
-			<widget class="GtkLabel" id="cycle_label">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">_Cycle After</property>
-			  <property name="use_underline">True</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_RIGHT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">1</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">8</property>
-			  <property name="ypad">0</property>
-			  <property name="mnemonic_widget">cycle_spinbutton</property>
-			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-			  <property name="width_chars">-1</property>
-			  <property name="single_line_mode">False</property>
-			  <property name="angle">0</property>
-			  <accessibility>
-			    <atkrelation target="cycle_spinbutton" type="label-for"/>
-			    <atkrelation target="cycle_spinbutton" type="flows-to"/>
-			  </accessibility>
-			</widget>
-			<packing>
-			  <property name="left_attach">1</property>
-			  <property name="right_attach">2</property>
-			  <property name="top_attach">1</property>
-			  <property name="bottom_attach">2</property>
-			  <property name="x_options">fill</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkEventBox" id="lock_button_eventbox">
-			  <property name="visible">True</property>
-			  <property name="tooltip" translatable="yes">Whether a password should be required to un-blank the screen.</property>
-			  <property name="visible_window">True</property>
-			  <property name="above_child">False</property>
-
-			  <child>
-			    <widget class="GtkCheckButton" id="lock_button">
-			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="label" translatable="yes">_Lock Screen After  </property>
-			      <property name="use_underline">True</property>
-			      <property name="relief">GTK_RELIEF_NORMAL</property>
-			      <property name="focus_on_click">True</property>
-			      <property name="active">False</property>
-			      <property name="inconsistent">False</property>
-			      <property name="draw_indicator">True</property>
-			      <accessibility>
-				<atkproperty name="AtkObject::accessible_name" translatable="yes">Lock Screen</atkproperty>
-				<atkrelation target="lock_spinbutton" type="controller-for"/>
-				<atkrelation target="lock_spinbutton" type="label-for"/>
-				<atkrelation target="lock_spinbutton" type="flows-to"/>
-			      </accessibility>
-			      <signal name="toggled" handler="pref_changed_cb"/>
-			    </widget>
-			  </child>
-			</widget>
-			<packing>
-			  <property name="left_attach">0</property>
-			  <property name="right_attach">2</property>
-			  <property name="top_attach">2</property>
-			  <property name="bottom_attach">3</property>
-			  <property name="x_options">fill</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkSpinButton" id="timeout_spinbutton">
-			  <property name="visible">True</property>
-			  <property name="tooltip" translatable="yes">How long before the screen saver activates.</property>
-			  <property name="can_focus">True</property>
-			  <property name="climb_rate">15</property>
-			  <property name="digits">0</property>
-			  <property name="numeric">True</property>
-			  <property name="update_policy">GTK_UPDATE_ALWAYS</property>
-			  <property name="snap_to_ticks">True</property>
-			  <property name="wrap">False</property>
-			  <property name="adjustment">1 1 720 1 15 0</property>
-			  <accessibility>
-			    <atkrelation target="timeout_label" type="labelled-by"/>
-			    <atkrelation target="timeout_mlabel" type="labelled-by"/>
-			    <atkrelation target="timeout_label" type="flows-from"/>
-			    <atkrelation target="timeout_mlabel" type="flows-to"/>
-			  </accessibility>
-			  <signal name="activate" handler="pref_changed_cb"/>
-			  <signal name="focus_out_event" handler="pref_changed_event_cb"/>
-			  <signal name="value_changed" handler="pref_changed_cb"/>
-			</widget>
-			<packing>
-			  <property name="left_attach">2</property>
-			  <property name="right_attach">3</property>
-			  <property name="top_attach">0</property>
-			  <property name="bottom_attach">1</property>
-			  <property name="x_options">fill</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkSpinButton" id="lock_spinbutton">
-			  <property name="visible">True</property>
-			  <property name="tooltip" translatable="yes">How long after the screen blanks until a password will be required.</property>
-			  <property name="can_focus">True</property>
-			  <property name="climb_rate">15</property>
-			  <property name="digits">0</property>
-			  <property name="numeric">True</property>
-			  <property name="update_policy">GTK_UPDATE_ALWAYS</property>
-			  <property name="snap_to_ticks">True</property>
-			  <property name="wrap">False</property>
-			  <property name="adjustment">0 0 720 1 15 0</property>
-			  <accessibility>
-			    <atkproperty name="AtkObject::accessible_name" translatable="yes">Lock Screen After</atkproperty>
-			    <atkrelation target="lock_button" type="controlled-by"/>
-			    <atkrelation target="lock_button" type="labelled-by"/>
-			    <atkrelation target="lock_mlabel" type="labelled-by"/>
-			    <atkrelation target="lock_button" type="flows-from"/>
-			    <atkrelation target="lock_mlabel" type="flows-to"/>
-			  </accessibility>
-			  <signal name="activate" handler="pref_changed_cb"/>
-			  <signal name="focus_out_event" handler="pref_changed_event_cb"/>
-			  <signal name="value_changed" handler="pref_changed_cb"/>
-			</widget>
-			<packing>
-			  <property name="left_attach">2</property>
-			  <property name="right_attach">3</property>
-			  <property name="top_attach">2</property>
-			  <property name="bottom_attach">3</property>
-			  <property name="y_padding">10</property>
-			  <property name="x_options">fill</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkSpinButton" id="cycle_spinbutton">
-			  <property name="visible">True</property>
-			  <property name="tooltip" translatable="yes">How long each display mode should run before choosing a new one (in Random mode.)</property>
-			  <property name="can_focus">True</property>
-			  <property name="climb_rate">15</property>
-			  <property name="digits">0</property>
-			  <property name="numeric">True</property>
-			  <property name="update_policy">GTK_UPDATE_ALWAYS</property>
-			  <property name="snap_to_ticks">True</property>
-			  <property name="wrap">False</property>
-			  <property name="adjustment">0 0 720 1 15 0</property>
-			  <accessibility>
-			    <atkrelation target="cycle_label" type="labelled-by"/>
-			    <atkrelation target="cycle_mlabel" type="labelled-by"/>
-			    <atkrelation target="cycle_label" type="flows-from"/>
-			    <atkrelation target="cycle_mlabel" type="flows-to"/>
-			  </accessibility>
-			  <signal name="activate" handler="pref_changed_cb"/>
-			  <signal name="focus_out_event" handler="pref_changed_event_cb"/>
-			  <signal name="value_changed" handler="pref_changed_cb"/>
-			</widget>
-			<packing>
-			  <property name="left_attach">2</property>
-			  <property name="right_attach">3</property>
-			  <property name="top_attach">1</property>
-			  <property name="bottom_attach">2</property>
-			  <property name="x_options">fill</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkLabel" id="lock_mlabel">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">minutes</property>
-			  <property name="use_underline">False</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">8</property>
-			  <property name="ypad">0</property>
-			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-			  <property name="width_chars">-1</property>
-			  <property name="single_line_mode">False</property>
-			  <property name="angle">0</property>
-			  <accessibility>
-			    <atkrelation target="lock_spinbutton" type="label-for"/>
-			    <atkrelation target="lock_spinbutton" type="flows-to"/>
-			  </accessibility>
-			</widget>
-			<packing>
-			  <property name="left_attach">3</property>
-			  <property name="right_attach">4</property>
-			  <property name="top_attach">2</property>
-			  <property name="bottom_attach">3</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkLabel" id="cycle_mlabel">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">minutes</property>
-			  <property name="use_underline">False</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">8</property>
-			  <property name="ypad">0</property>
-			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-			  <property name="width_chars">-1</property>
-			  <property name="single_line_mode">False</property>
-			  <property name="angle">0</property>
-			  <accessibility>
-			    <atkrelation target="cycle_spinbutton" type="label-for"/>
-			    <atkrelation target="cycle_spinbutton" type="flows-from"/>
-			  </accessibility>
-			</widget>
-			<packing>
-			  <property name="left_attach">3</property>
-			  <property name="right_attach">4</property>
-			  <property name="top_attach">1</property>
-			  <property name="bottom_attach">2</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkLabel" id="timeout_label">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">_Blank After</property>
-			  <property name="use_underline">True</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_RIGHT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">1</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">8</property>
-			  <property name="ypad">0</property>
-			  <property name="mnemonic_widget">timeout_spinbutton</property>
-			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-			  <property name="width_chars">-1</property>
-			  <property name="single_line_mode">False</property>
-			  <property name="angle">0</property>
-			  <accessibility>
-			    <atkrelation target="timeout_spinbutton" type="label-for"/>
-			    <atkrelation target="timeout_spinbutton" type="flows-to"/>
-			  </accessibility>
-			</widget>
-			<packing>
-			  <property name="left_attach">1</property>
-			  <property name="right_attach">2</property>
-			  <property name="top_attach">0</property>
-			  <property name="bottom_attach">1</property>
-			  <property name="x_options">fill</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkLabel" id="timeout_mlabel">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">minutes</property>
-			  <property name="use_underline">False</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">8</property>
-			  <property name="ypad">0</property>
-			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-			  <property name="width_chars">-1</property>
-			  <property name="single_line_mode">False</property>
-			  <property name="angle">0</property>
-			  <accessibility>
-			    <atkrelation target="timeout_spinbutton" type="label-for"/>
-			    <atkrelation target="timeout_spinbutton" type="flows-from"/>
-			  </accessibility>
-			</widget>
-			<packing>
-			  <property name="left_attach">3</property>
-			  <property name="right_attach">4</property>
-			  <property name="top_attach">0</property>
-			  <property name="bottom_attach">1</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-		    </widget>
-		    <packing>
-		      <property name="left_attach">0</property>
-		      <property name="right_attach">1</property>
-		      <property name="top_attach">1</property>
-		      <property name="bottom_attach">2</property>
-		      <property name="x_options">fill</property>
-		      <property name="y_options">fill</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkHButtonBox" id="demo_manual_hbbox">
-		      <property name="visible">True</property>
-		      <property name="layout_style">GTK_BUTTONBOX_SPREAD</property>
-		      <property name="spacing">30</property>
-
-		      <child>
-			<widget class="GtkButton" id="demo">
-			  <property name="visible">True</property>
-			  <property name="tooltip" translatable="yes">Demo the selected screen saver in full-screen mode (click the mouse to return.)</property>
-			  <property name="can_default">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="label" translatable="yes">_Preview</property>
-			  <property name="use_underline">True</property>
-			  <property name="relief">GTK_RELIEF_NORMAL</property>
-			  <property name="focus_on_click">True</property>
-			  <signal name="clicked" handler="run_this_cb"/>
-			</widget>
-		      </child>
-
-		      <child>
-			<widget class="GtkButton" id="settings">
-			  <property name="visible">True</property>
-			  <property name="tooltip" translatable="yes">Customization and explanation of the selected screen saver.</property>
-			  <property name="can_default">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="label" translatable="yes">_Settings...</property>
-			  <property name="use_underline">True</property>
-			  <property name="relief">GTK_RELIEF_NORMAL</property>
-			  <property name="focus_on_click">True</property>
-			  <signal name="clicked" handler="settings_cb"/>
-			</widget>
-		      </child>
-		    </widget>
-		    <packing>
-		      <property name="left_attach">1</property>
-		      <property name="right_attach">2</property>
-		      <property name="top_attach">1</property>
-		      <property name="bottom_attach">2</property>
-		      <property name="x_options">fill</property>
-		      <property name="y_options">fill</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkVBox" id="list_vbox">
-		      <property name="border_width">10</property>
-		      <property name="visible">True</property>
-		      <property name="homogeneous">False</property>
-		      <property name="spacing">0</property>
-
-		      <child>
-			<widget class="GtkHBox" id="mode_hbox">
-			  <property name="visible">True</property>
-			  <property name="homogeneous">False</property>
-			  <property name="spacing">0</property>
-
-			  <child>
-			    <widget class="GtkLabel" id="mode_label">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">_Mode:</property>
-			      <property name="use_underline">True</property>
-			      <property name="use_markup">False</property>
-			      <property name="justify">GTK_JUSTIFY_LEFT</property>
-			      <property name="wrap">False</property>
-			      <property name="selectable">False</property>
-			      <property name="xalign">0</property>
-			      <property name="yalign">0.5</property>
-			      <property name="xpad">0</property>
-			      <property name="ypad">0</property>
-			      <property name="mnemonic_widget">mode_menu</property>
-			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-			      <property name="width_chars">-1</property>
-			      <property name="single_line_mode">False</property>
-			      <property name="angle">0</property>
-			      <accessibility>
-				<atkrelation target="mode_menu_popup" type="label-for"/>
-			      </accessibility>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkOptionMenu" id="mode_menu">
-			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="history">0</property>
-			      <accessibility>
-				<atkrelation target="mode_label" type="labelled-by"/>
-			      </accessibility>
-
-			      <child internal-child="menu">
-				<widget class="GtkMenu" id="mode_menu_popup">
-				  <property name="visible">True</property>
-
-				  <child>
-				    <widget class="GtkMenuItem" id="disable_menuitem">
-				      <property name="visible">True</property>
-				      <property name="tooltip" translatable="yes">Never blank the screen or power down the monitor.</property>
-				      <property name="label" translatable="yes">_Disable Screen Saver</property>
-				      <property name="use_underline">True</property>
-				    </widget>
-				  </child>
-
-				  <child>
-				    <widget class="GtkMenuItem" id="blank_menuitem">
-				      <property name="visible">True</property>
-				      <property name="tooltip" translatable="yes">When idle or locked, blacken the screen only.</property>
-				      <property name="label" translatable="yes">_Blank Screen Only</property>
-				      <property name="use_underline">True</property>
-				    </widget>
-				  </child>
-
-				  <child>
-				    <widget class="GtkMenuItem" id="one_menuitem">
-				      <property name="visible">True</property>
-				      <property name="tooltip" translatable="yes">When idle or locked, run the display mode selected below.</property>
-				      <property name="label" translatable="yes">_Only One Screen Saver</property>
-				      <property name="use_underline">True</property>
-				    </widget>
-				  </child>
-
-				  <child>
-				    <widget class="GtkMenuItem" id="random_menuitem">
-				      <property name="visible">True</property>
-				      <property name="tooltip" translatable="yes">When idle or locked, choose a random display mode from among the checked items in the list below.</property>
-				      <property name="label" translatable="yes">_Random Screen Saver</property>
-				      <property name="use_underline">True</property>
-				    </widget>
-				  </child>
-
-				  <child>
-				    <widget class="GtkMenuItem" id="random_same_menuitem">
-				      <property name="visible">True</property>
-				      <property name="tooltip" translatable="yes">When idle or locked, choose a random display mode from among the checked items in the list below.  Run that same mode on each monitor.</property>
-				      <property name="label" translatable="yes">_Same Random Savers</property>
-				      <property name="use_underline">True</property>
-				    </widget>
-				  </child>
-				</widget>
-			      </child>
-			    </widget>
-			    <packing>
-			      <property name="padding">4</property>
-			      <property name="expand">True</property>
-			      <property name="fill">True</property>
-			    </packing>
-			  </child>
-			</widget>
-			<packing>
-			  <property name="padding">10</property>
-			  <property name="expand">False</property>
-			  <property name="fill">True</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkScrolledWindow" id="scroller">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
-			  <property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
-			  <property name="shadow_type">GTK_SHADOW_IN</property>
-			  <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
-
-			  <child>
-			    <widget class="GtkTreeView" id="list">
-			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="headers_visible">False</property>
-			      <property name="rules_hint">True</property>
-			      <property name="reorderable">False</property>
-			      <property name="enable_search">True</property>
-			      <property name="fixed_height_mode">False</property>
-			      <property name="hover_selection">False</property>
-			      <property name="hover_expand">False</property>
-			    </widget>
-			  </child>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">True</property>
-			  <property name="fill">True</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkHBox" id="centering_hbox">
-			  <property name="visible">True</property>
-			  <property name="homogeneous">True</property>
-			  <property name="spacing">0</property>
-
-			  <child>
-			    <widget class="GtkHBox" id="next_prev_hbox">
-			      <property name="visible">True</property>
-			      <property name="homogeneous">False</property>
-			      <property name="spacing">0</property>
-
-			      <child>
-				<widget class="GtkButton" id="next">
-				  <property name="visible">True</property>
-				  <property name="tooltip" translatable="yes">Run the next screen saver in the list in full-screen mode (click the mouse to return.)</property>
-				  <property name="can_focus">True</property>
-				  <property name="relief">GTK_RELIEF_NORMAL</property>
-				  <property name="focus_on_click">True</property>
-				  <signal name="clicked" handler="run_next_cb"/>
-
-				  <child>
-				    <widget class="GtkArrow" id="arrow1">
-				      <property name="visible">True</property>
-				      <property name="arrow_type">GTK_ARROW_DOWN</property>
-				      <property name="shadow_type">GTK_SHADOW_OUT</property>
-				      <property name="xalign">0.5</property>
-				      <property name="yalign">0.5</property>
-				      <property name="xpad">0</property>
-				      <property name="ypad">0</property>
-				    </widget>
-				  </child>
-				</widget>
-				<packing>
-				  <property name="padding">0</property>
-				  <property name="expand">False</property>
-				  <property name="fill">False</property>
-				</packing>
-			      </child>
-
-			      <child>
-				<widget class="GtkButton" id="prev">
-				  <property name="visible">True</property>
-				  <property name="tooltip" translatable="yes">Run the previous screen saver in the list in full-screen mode (click the mouse to return.)</property>
-				  <property name="can_focus">True</property>
-				  <property name="relief">GTK_RELIEF_NORMAL</property>
-				  <property name="focus_on_click">True</property>
-				  <signal name="clicked" handler="run_prev_cb"/>
-
-				  <child>
-				    <widget class="GtkArrow" id="arrow2">
-				      <property name="visible">True</property>
-				      <property name="arrow_type">GTK_ARROW_UP</property>
-				      <property name="shadow_type">GTK_SHADOW_OUT</property>
-				      <property name="xalign">0.5</property>
-				      <property name="yalign">0.5</property>
-				      <property name="xpad">0</property>
-				      <property name="ypad">0</property>
-				    </widget>
-				  </child>
-				</widget>
-				<packing>
-				  <property name="padding">0</property>
-				  <property name="expand">False</property>
-				  <property name="fill">False</property>
-				</packing>
-			      </child>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
-			    </packing>
-			  </child>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">True</property>
-			  <property name="pack_type">GTK_PACK_END</property>
-			</packing>
-		      </child>
-		    </widget>
-		    <packing>
-		      <property name="left_attach">0</property>
-		      <property name="right_attach">1</property>
-		      <property name="top_attach">0</property>
-		      <property name="bottom_attach">1</property>
-		      <property name="x_options">fill</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkFrame" id="preview_frame">
-		      <property name="visible">True</property>
-		      <property name="label_xalign">0</property>
-		      <property name="label_yalign">0.5</property>
-		      <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
-		      <accessibility>
-			<atkrelation target="label1" type="labelled-by"/>
-		      </accessibility>
-
-		      <child>
-			<widget class="GtkNotebook" id="preview_notebook">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="show_tabs">True</property>
-			  <property name="show_border">False</property>
-			  <property name="tab_pos">GTK_POS_BOTTOM</property>
-			  <property name="scrollable">False</property>
-			  <property name="enable_popup">False</property>
-
-			  <child>
-			    <widget class="GtkAspectFrame" id="preview_aspectframe">
-			      <property name="border_width">8</property>
-			      <property name="visible">True</property>
-			      <property name="label_xalign">0</property>
-			      <property name="label_yalign">0.5</property>
-			      <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
-			      <property name="xalign">0.5</property>
-			      <property name="yalign">0.5</property>
-			      <property name="ratio">1.33000004292</property>
-			      <property name="obey_child">False</property>
-
-			      <child>
-				<widget class="GtkDrawingArea" id="preview">
-				  <property name="visible">True</property>
-				</widget>
-			      </child>
-			    </widget>
-			    <packing>
-			      <property name="tab_expand">False</property>
-			      <property name="tab_fill">True</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkLabel" id="preview_tab">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">preview</property>
-			      <property name="use_underline">False</property>
-			      <property name="use_markup">False</property>
-			      <property name="justify">GTK_JUSTIFY_LEFT</property>
-			      <property name="wrap">False</property>
-			      <property name="selectable">False</property>
-			      <property name="xalign">0.5</property>
-			      <property name="yalign">0.5</property>
-			      <property name="xpad">0</property>
-			      <property name="ypad">0</property>
-			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-			      <property name="width_chars">-1</property>
-			      <property name="single_line_mode">False</property>
-			      <property name="angle">0</property>
-			    </widget>
-			    <packing>
-			      <property name="type">tab</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkLabel" id="no_preview_label">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">No Preview
-Available</property>
-			      <property name="use_underline">False</property>
-			      <property name="use_markup">False</property>
-			      <property name="justify">GTK_JUSTIFY_CENTER</property>
-			      <property name="wrap">False</property>
-			      <property name="selectable">False</property>
-			      <property name="xalign">0.5</property>
-			      <property name="yalign">0.5</property>
-			      <property name="xpad">0</property>
-			      <property name="ypad">0</property>
-			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-			      <property name="width_chars">-1</property>
-			      <property name="single_line_mode">False</property>
-			      <property name="angle">0</property>
-			    </widget>
-			    <packing>
-			      <property name="tab_expand">False</property>
-			      <property name="tab_fill">True</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkLabel" id="no_preview_tab">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">no preview</property>
-			      <property name="use_underline">False</property>
-			      <property name="use_markup">False</property>
-			      <property name="justify">GTK_JUSTIFY_LEFT</property>
-			      <property name="wrap">False</property>
-			      <property name="selectable">False</property>
-			      <property name="xalign">0.5</property>
-			      <property name="yalign">0.5</property>
-			      <property name="xpad">0</property>
-			      <property name="ypad">0</property>
-			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-			      <property name="width_chars">-1</property>
-			      <property name="single_line_mode">False</property>
-			      <property name="angle">0</property>
-			    </widget>
-			    <packing>
-			      <property name="type">tab</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkLabel" id="not_installed_label">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">Not
-Installed</property>
-			      <property name="use_underline">False</property>
-			      <property name="use_markup">False</property>
-			      <property name="justify">GTK_JUSTIFY_CENTER</property>
-			      <property name="wrap">False</property>
-			      <property name="selectable">False</property>
-			      <property name="xalign">0.5</property>
-			      <property name="yalign">0.5</property>
-			      <property name="xpad">0</property>
-			      <property name="ypad">0</property>
-			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-			      <property name="width_chars">-1</property>
-			      <property name="single_line_mode">False</property>
-			      <property name="angle">0</property>
-			    </widget>
-			    <packing>
-			      <property name="tab_expand">False</property>
-			      <property name="tab_fill">True</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkLabel" id="not_installed_tab">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">not installed</property>
-			      <property name="use_underline">False</property>
-			      <property name="use_markup">False</property>
-			      <property name="justify">GTK_JUSTIFY_LEFT</property>
-			      <property name="wrap">False</property>
-			      <property name="selectable">False</property>
-			      <property name="xalign">0.5</property>
-			      <property name="yalign">0.5</property>
-			      <property name="xpad">0</property>
-			      <property name="ypad">0</property>
-			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-			      <property name="width_chars">-1</property>
-			      <property name="single_line_mode">False</property>
-			      <property name="angle">0</property>
-			    </widget>
-			    <packing>
-			      <property name="type">tab</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkLabel" id="nothing_label">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">Very few (or no) screen savers appear to be available.
-
-This probably means that the &quot;xscreensaver-extras&quot; and
-&quot;xscreensaver-gl-extras&quot; packages are not installed.</property>
-			      <property name="use_underline">False</property>
-			      <property name="use_markup">False</property>
-			      <property name="justify">GTK_JUSTIFY_CENTER</property>
-			      <property name="wrap">False</property>
-			      <property name="selectable">False</property>
-			      <property name="xalign">0.5</property>
-			      <property name="yalign">0.5</property>
-			      <property name="xpad">0</property>
-			      <property name="ypad">0</property>
-			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-			      <property name="width_chars">-1</property>
-			      <property name="single_line_mode">False</property>
-			      <property name="angle">0</property>
-			    </widget>
-			    <packing>
-			      <property name="tab_expand">False</property>
-			      <property name="tab_fill">True</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkLabel" id="nothing_tab">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">nothing</property>
-			      <property name="use_underline">False</property>
-			      <property name="use_markup">False</property>
-			      <property name="justify">GTK_JUSTIFY_LEFT</property>
-			      <property name="wrap">False</property>
-			      <property name="selectable">False</property>
-			      <property name="xalign">0.5</property>
-			      <property name="yalign">0.5</property>
-			      <property name="xpad">0</property>
-			      <property name="ypad">0</property>
-			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-			      <property name="width_chars">-1</property>
-			      <property name="single_line_mode">False</property>
-			      <property name="angle">0</property>
-			    </widget>
-			    <packing>
-			      <property name="type">tab</property>
-			    </packing>
-			  </child>
-			</widget>
-		      </child>
-
-		      <child>
-			<widget class="GtkLabel" id="label1">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">Description</property>
-			  <property name="use_underline">False</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0.5</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-			  <property name="width_chars">-1</property>
-			  <property name="single_line_mode">False</property>
-			  <property name="angle">0</property>
-			  <accessibility>
-			    <atkrelation target="preview_frame" type="label-for"/>
-			  </accessibility>
-			</widget>
-			<packing>
-			  <property name="type">label_item</property>
-			</packing>
-		      </child>
-		    </widget>
-		    <packing>
-		      <property name="left_attach">1</property>
-		      <property name="right_attach">2</property>
-		      <property name="top_attach">0</property>
-		      <property name="bottom_attach">1</property>
-		      <property name="y_padding">6</property>
-		      <property name="x_options">expand|shrink|fill</property>
-		      <property name="y_options">expand|shrink|fill</property>
-		    </packing>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="tab_expand">False</property>
-		  <property name="tab_fill">True</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkLabel" id="demo_tab">
-		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">_Display Modes</property>
-		  <property name="use_underline">True</property>
-		  <property name="use_markup">False</property>
-		  <property name="justify">GTK_JUSTIFY_CENTER</property>
-		  <property name="wrap">False</property>
-		  <property name="selectable">False</property>
-		  <property name="xalign">0.5</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">0</property>
-		  <property name="ypad">0</property>
-		  <property name="mnemonic_widget">notebook</property>
-		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-		  <property name="width_chars">-1</property>
-		  <property name="single_line_mode">False</property>
-		  <property name="angle">0</property>
-		</widget>
-		<packing>
-		  <property name="type">tab</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkTable" id="options_table">
-		  <property name="visible">True</property>
-		  <property name="n_rows">2</property>
-		  <property name="n_columns">2</property>
-		  <property name="homogeneous">True</property>
-		  <property name="row_spacing">0</property>
-		  <property name="column_spacing">0</property>
-
-		  <child>
-		    <widget class="GtkFrame" id="grab_frame">
-		      <property name="border_width">10</property>
-		      <property name="visible">True</property>
-		      <property name="label_xalign">0</property>
-		      <property name="label_yalign">0.5</property>
-		      <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
-		      <accessibility>
-			<atkrelation target="label2" type="labelled-by"/>
-		      </accessibility>
-
-		      <child>
-			<widget class="GtkHBox" id="grab_hbox">
-			  <property name="border_width">8</property>
-			  <property name="visible">True</property>
-			  <property name="homogeneous">False</property>
-			  <property name="spacing">8</property>
-
-			  <child>
-			    <widget class="GtkImage" id="image2">
-			      <property name="visible">True</property>
-			      <property name="pixbuf">screensaver-snap.png</property>
-			      <property name="xalign">0</property>
-			      <property name="yalign">0</property>
-			      <property name="xpad">4</property>
-			      <property name="ypad">8</property>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkVBox" id="grab_vbox">
-			      <property name="visible">True</property>
-			      <property name="homogeneous">False</property>
-			      <property name="spacing">0</property>
-
-			      <child>
-				<widget class="GtkCheckButton" id="grab_desk_button">
-				  <property name="visible">True</property>
-				  <property name="tooltip" translatable="yes">Whether the image-manipulating modes should be allowed to operate on an image of your desktop.</property>
-				  <property name="can_focus">True</property>
-				  <property name="label" translatable="yes">Grab Desktop _Images</property>
-				  <property name="use_underline">True</property>
-				  <property name="relief">GTK_RELIEF_NORMAL</property>
-				  <property name="focus_on_click">True</property>
-				  <property name="active">False</property>
-				  <property name="inconsistent">False</property>
-				  <property name="draw_indicator">True</property>
-				  <signal name="toggled" handler="pref_changed_cb"/>
-				</widget>
-				<packing>
-				  <property name="padding">0</property>
-				  <property name="expand">False</property>
-				  <property name="fill">False</property>
-				</packing>
-			      </child>
-
-			      <child>
-				<widget class="GtkCheckButton" id="grab_video_button">
-				  <property name="visible">True</property>
-				  <property name="tooltip" translatable="yes">Whether the image-manipulating modes should operate on images captured from the system's video input (if there is one.)</property>
-				  <property name="can_focus">True</property>
-				  <property name="label" translatable="yes">Grab _Video Frames</property>
-				  <property name="use_underline">True</property>
-				  <property name="relief">GTK_RELIEF_NORMAL</property>
-				  <property name="focus_on_click">True</property>
-				  <property name="active">False</property>
-				  <property name="inconsistent">False</property>
-				  <property name="draw_indicator">True</property>
-				  <signal name="toggled" handler="pref_changed_cb"/>
-				</widget>
-				<packing>
-				  <property name="padding">0</property>
-				  <property name="expand">False</property>
-				  <property name="fill">False</property>
-				</packing>
-			      </child>
-
-			      <child>
-				<widget class="GtkCheckButton" id="grab_image_button">
-				  <property name="visible">True</property>
-				  <property name="tooltip" translatable="yes">Whether the image-manipulating modes should load image files.</property>
-				  <property name="can_focus">True</property>
-				  <property name="label" translatable="yes">Choose _Random Image:</property>
-				  <property name="use_underline">True</property>
-				  <property name="relief">GTK_RELIEF_NORMAL</property>
-				  <property name="focus_on_click">True</property>
-				  <property name="active">False</property>
-				  <property name="inconsistent">False</property>
-				  <property name="draw_indicator">True</property>
-				  <accessibility>
-				    <atkrelation target="image_text" type="controller-for"/>
-				    <atkrelation target="image_browse_button" type="controller-for"/>
-				  </accessibility>
-				  <signal name="toggled" handler="pref_changed_cb"/>
-				</widget>
-				<packing>
-				  <property name="padding">0</property>
-				  <property name="expand">False</property>
-				  <property name="fill">False</property>
-				</packing>
-			      </child>
-
-			      <child>
-				<widget class="GtkHBox" id="image_hbox">
-				  <property name="visible">True</property>
-				  <property name="homogeneous">False</property>
-				  <property name="spacing">0</property>
-
-				  <child>
-				    <widget class="GtkLabel" id="grab_dummy">
-				      <property name="visible">True</property>
-				      <property name="label" translatable="yes"></property>
-				      <property name="use_underline">False</property>
-				      <property name="use_markup">False</property>
-				      <property name="justify">GTK_JUSTIFY_LEFT</property>
-				      <property name="wrap">False</property>
-				      <property name="selectable">False</property>
-				      <property name="xalign">0.5</property>
-				      <property name="yalign">0.5</property>
-				      <property name="xpad">8</property>
-				      <property name="ypad">0</property>
-				      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-				      <property name="width_chars">-1</property>
-				      <property name="single_line_mode">False</property>
-				      <property name="angle">0</property>
-				    </widget>
-				    <packing>
-				      <property name="padding">0</property>
-				      <property name="expand">False</property>
-				      <property name="fill">False</property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkEntry" id="image_text">
-				      <property name="visible">True</property>
-				      <property name="tooltip" translatable="yes">The local directory, RSS feed or Atom feed from which images will be randomly chosen.</property>
-				      <property name="can_focus">True</property>
-				      <property name="editable">True</property>
-				      <property name="visibility">True</property>
-				      <property name="max_length">0</property>
-				      <property name="text" translatable="yes"></property>
-				      <property name="has_frame">True</property>
-				      <property name="invisible_char">*</property>
-				      <property name="activates_default">False</property>
-				      <accessibility>
-					<atkrelation target="grab_image_button" type="labelled-by"/>
-					<atkrelation target="grab_image_button" type="controlled-by"/>
-				      </accessibility>
-				      <signal name="activate" handler="pref_changed_cb"/>
-				      <signal name="focus_out_event" handler="pref_changed_event_cb"/>
-				    </widget>
-				    <packing>
-				      <property name="padding">2</property>
-				      <property name="expand">True</property>
-				      <property name="fill">True</property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkButton" id="image_browse_button">
-				      <property name="visible">True</property>
-				      <property name="can_focus">True</property>
-				      <property name="label" translatable="yes">_Browse</property>
-				      <property name="use_underline">True</property>
-				      <property name="relief">GTK_RELIEF_NORMAL</property>
-				      <property name="focus_on_click">True</property>
-				      <signal name="clicked" handler="browse_image_dir_cb"/>
-				    </widget>
-				    <packing>
-				      <property name="padding">0</property>
-				      <property name="expand">False</property>
-				      <property name="fill">False</property>
-				    </packing>
-				  </child>
-				</widget>
-				<packing>
-				  <property name="padding">0</property>
-				  <property name="expand">False</property>
-				  <property name="fill">False</property>
-				</packing>
-			      </child>
-
-			      <child>
-				<widget class="GtkLabel" id="label8">
-				  <property name="visible">True</property>
-				  <property name="label" translatable="yes">Local directory, or RSS feed URL.</property>
-				  <property name="use_underline">False</property>
-				  <property name="use_markup">False</property>
-				  <property name="justify">GTK_JUSTIFY_LEFT</property>
-				  <property name="wrap">False</property>
-				  <property name="selectable">False</property>
-				  <property name="xalign">0</property>
-				  <property name="yalign">0.5</property>
-				  <property name="xpad">20</property>
-				  <property name="ypad">0</property>
-				  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-				  <property name="width_chars">-1</property>
-				  <property name="single_line_mode">False</property>
-				  <property name="angle">0</property>
-				</widget>
-				<packing>
-				  <property name="padding">0</property>
-				  <property name="expand">False</property>
-				  <property name="fill">False</property>
-				</packing>
-			      </child>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">True</property>
-			      <property name="fill">True</property>
-			    </packing>
-			  </child>
-			</widget>
-		      </child>
-
-		      <child>
-			<widget class="GtkLabel" id="label2">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">Image Manipulation</property>
-			  <property name="use_underline">False</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0.5</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-			  <property name="width_chars">-1</property>
-			  <property name="single_line_mode">False</property>
-			  <property name="angle">0</property>
-			  <accessibility>
-			    <atkrelation target="grab_frame" type="label-for"/>
-			  </accessibility>
-			</widget>
-			<packing>
-			  <property name="type">label_item</property>
-			</packing>
-		      </child>
-		    </widget>
-		    <packing>
-		      <property name="left_attach">0</property>
-		      <property name="right_attach">1</property>
-		      <property name="top_attach">0</property>
-		      <property name="bottom_attach">1</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkFrame" id="diag_frame">
-		      <property name="border_width">10</property>
-		      <property name="visible">True</property>
-		      <property name="label_xalign">0</property>
-		      <property name="label_yalign">0.5</property>
-		      <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
-		      <accessibility>
-			<atkrelation target="label3" type="labelled-by"/>
-		      </accessibility>
-
-		      <child>
-			<widget class="GtkHBox" id="diag_hbox">
-			  <property name="border_width">8</property>
-			  <property name="visible">True</property>
-			  <property name="homogeneous">False</property>
-			  <property name="spacing">8</property>
-
-			  <child>
-			    <widget class="GtkImage" id="diag_logo">
-			      <property name="visible">True</property>
-			      <property name="pixbuf">screensaver-diagnostic.png</property>
-			      <property name="xalign">0.5</property>
-			      <property name="yalign">0</property>
-			      <property name="xpad">0</property>
-			      <property name="ypad">0</property>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkTable" id="text_table">
-			      <property name="visible">True</property>
-			      <property name="n_rows">5</property>
-			      <property name="n_columns">3</property>
-			      <property name="homogeneous">False</property>
-			      <property name="row_spacing">2</property>
-			      <property name="column_spacing">2</property>
-
-			      <child>
-				<widget class="GtkRadioButton" id="text_radio">
-				  <property name="visible">True</property>
-				  <property name="tooltip" translatable="yes">Text-displaying modes will display the text typed here.</property>
-				  <property name="can_focus">True</property>
-				  <property name="label" translatable="yes">_Text</property>
-				  <property name="use_underline">True</property>
-				  <property name="relief">GTK_RELIEF_NORMAL</property>
-				  <property name="focus_on_click">True</property>
-				  <property name="active">False</property>
-				  <property name="inconsistent">False</property>
-				  <property name="draw_indicator">True</property>
-				  <accessibility>
-				    <atkrelation target="text_entry" type="controller-for"/>
-				    <atkrelation target="text_entry" type="label-for"/>
-				  </accessibility>
-				  <signal name="toggled" handler="pref_changed_cb" last_modification_time="Sun, 20 Mar 2005 21:31:44 GMT"/>
-				</widget>
-				<packing>
-				  <property name="left_attach">0</property>
-				  <property name="right_attach">1</property>
-				  <property name="top_attach">1</property>
-				  <property name="bottom_attach">2</property>
-				  <property name="x_options">fill</property>
-				  <property name="y_options"></property>
-				</packing>
-			      </child>
-
-			      <child>
-				<widget class="GtkRadioButton" id="text_file_radio">
-				  <property name="visible">True</property>
-				  <property name="tooltip" translatable="yes">Text-displaying modes will display the contents of this file.</property>
-				  <property name="can_focus">True</property>
-				  <property name="label" translatable="yes">Text _file</property>
-				  <property name="use_underline">True</property>
-				  <property name="relief">GTK_RELIEF_NORMAL</property>
-				  <property name="focus_on_click">True</property>
-				  <property name="active">False</property>
-				  <property name="inconsistent">False</property>
-				  <property name="draw_indicator">True</property>
-				  <property name="group">text_radio</property>
-				  <accessibility>
-				    <atkrelation target="text_file_entry" type="label-for"/>
-				    <atkrelation target="text_file_entry" type="controller-for"/>
-				  </accessibility>
-				  <signal name="toggled" handler="pref_changed_cb" last_modification_time="Sun, 20 Mar 2005 21:31:55 GMT"/>
-				</widget>
-				<packing>
-				  <property name="left_attach">0</property>
-				  <property name="right_attach">1</property>
-				  <property name="top_attach">2</property>
-				  <property name="bottom_attach">3</property>
-				  <property name="x_options">fill</property>
-				  <property name="y_options"></property>
-				</packing>
-			      </child>
-
-			      <child>
-				<widget class="GtkRadioButton" id="text_program_radio">
-				  <property name="visible">True</property>
-				  <property name="tooltip" translatable="yes">Text-displaying modes will display the output of this program.</property>
-				  <property name="can_focus">True</property>
-				  <property name="label" translatable="yes">_Program</property>
-				  <property name="use_underline">True</property>
-				  <property name="relief">GTK_RELIEF_NORMAL</property>
-				  <property name="focus_on_click">True</property>
-				  <property name="active">False</property>
-				  <property name="inconsistent">False</property>
-				  <property name="draw_indicator">True</property>
-				  <property name="group">text_radio</property>
-				  <accessibility>
-				    <atkrelation target="text_program_entry" type="label-for"/>
-				    <atkrelation target="text_program_entry" type="controller-for"/>
-				    <atkrelation target="text_program_browse" type="controller-for"/>
-				  </accessibility>
-				  <signal name="toggled" handler="pref_changed_cb" last_modification_time="Sun, 20 Mar 2005 21:32:07 GMT"/>
-				</widget>
-				<packing>
-				  <property name="left_attach">0</property>
-				  <property name="right_attach">1</property>
-				  <property name="top_attach">3</property>
-				  <property name="bottom_attach">4</property>
-				  <property name="x_options">fill</property>
-				  <property name="y_options"></property>
-				</packing>
-			      </child>
-
-			      <child>
-				<widget class="GtkRadioButton" id="text_url_radio">
-				  <property name="visible">True</property>
-				  <property name="tooltip" translatable="yes">Text-displaying modes will display the contents of this URL (HTML or RSS).</property>
-				  <property name="can_focus">True</property>
-				  <property name="label" translatable="yes">_URL</property>
-				  <property name="use_underline">True</property>
-				  <property name="relief">GTK_RELIEF_NORMAL</property>
-				  <property name="focus_on_click">True</property>
-				  <property name="active">False</property>
-				  <property name="inconsistent">False</property>
-				  <property name="draw_indicator">True</property>
-				  <property name="group">text_radio</property>
-				  <accessibility>
-				    <atkrelation target="text_url_entry" type="label-for"/>
-				    <atkrelation target="text_url_entry" type="controller-for"/>
-				  </accessibility>
-				  <signal name="toggled" handler="pref_changed_cb" last_modification_time="Sun, 20 Mar 2005 21:32:17 GMT"/>
-				</widget>
-				<packing>
-				  <property name="left_attach">0</property>
-				  <property name="right_attach">1</property>
-				  <property name="top_attach">4</property>
-				  <property name="bottom_attach">5</property>
-				  <property name="x_options">fill</property>
-				  <property name="y_options"></property>
-				</packing>
-			      </child>
-
-			      <child>
-				<widget class="GtkRadioButton" id="text_host_radio">
-				  <property name="visible">True</property>
-				  <property name="tooltip" translatable="yes">Text-displaying modes will display the local host name, date, and time.</property>
-				  <property name="can_focus">True</property>
-				  <property name="label" translatable="yes">_Host Name and Time</property>
-				  <property name="use_underline">True</property>
-				  <property name="relief">GTK_RELIEF_NORMAL</property>
-				  <property name="focus_on_click">True</property>
-				  <property name="active">True</property>
-				  <property name="inconsistent">False</property>
-				  <property name="draw_indicator">True</property>
-				  <property name="group">text_radio</property>
-				  <signal name="toggled" handler="pref_changed_cb" last_modification_time="Sun, 20 Mar 2005 21:31:32 GMT"/>
-				</widget>
-				<packing>
-				  <property name="left_attach">0</property>
-				  <property name="right_attach">3</property>
-				  <property name="top_attach">0</property>
-				  <property name="bottom_attach">1</property>
-				  <property name="x_options">fill</property>
-				  <property name="y_options"></property>
-				</packing>
-			      </child>
-
-			      <child>
-				<widget class="GtkEntry" id="text_url_entry">
-				  <property name="visible">True</property>
-				  <property name="tooltip" translatable="yes">Text-displaying modes will display the contents of this URL (HTML or RSS).</property>
-				  <property name="can_focus">True</property>
-				  <property name="editable">True</property>
-				  <property name="visibility">True</property>
-				  <property name="max_length">0</property>
-				  <property name="text" translatable="yes"></property>
-				  <property name="has_frame">True</property>
-				  <property name="invisible_char">*</property>
-				  <property name="activates_default">False</property>
-				  <accessibility>
-				    <atkrelation target="text_url_radio" type="controlled-by"/>
-				  </accessibility>
-				  <signal name="activate" handler="pref_changed_cb" last_modification_time="Sun, 20 Mar 2005 21:33:10 GMT"/>
-				  <signal name="focus_out_event" handler="pref_changed_event_cb" last_modification_time="Sun, 20 Mar 2005 21:34:26 GMT"/>
-				</widget>
-				<packing>
-				  <property name="left_attach">1</property>
-				  <property name="right_attach">3</property>
-				  <property name="top_attach">4</property>
-				  <property name="bottom_attach">5</property>
-				  <property name="y_options"></property>
-				</packing>
-			      </child>
-
-			      <child>
-				<widget class="GtkButton" id="text_file_browse">
-				  <property name="visible">True</property>
-				  <property name="can_focus">True</property>
-				  <property name="label" translatable="yes">_Browse</property>
-				  <property name="use_underline">True</property>
-				  <property name="relief">GTK_RELIEF_NORMAL</property>
-				  <property name="focus_on_click">True</property>
-				  <accessibility>
-				    <atkrelation target="text_file_radio" type="controlled-by"/>
-				  </accessibility>
-				  <signal name="clicked" handler="browse_text_file_cb" last_modification_time="Sun, 20 Mar 2005 01:24:38 GMT"/>
-				</widget>
-				<packing>
-				  <property name="left_attach">2</property>
-				  <property name="right_attach">3</property>
-				  <property name="top_attach">2</property>
-				  <property name="bottom_attach">3</property>
-				  <property name="x_options">fill</property>
-				  <property name="y_options"></property>
-				</packing>
-			      </child>
-
-			      <child>
-				<widget class="GtkEntry" id="text_entry">
-				  <property name="visible">True</property>
-				  <property name="tooltip" translatable="yes">Text-displaying modes will display the text typed here.</property>
-				  <property name="can_focus">True</property>
-				  <property name="editable">True</property>
-				  <property name="visibility">True</property>
-				  <property name="max_length">0</property>
-				  <property name="text" translatable="yes"></property>
-				  <property name="has_frame">True</property>
-				  <property name="invisible_char">*</property>
-				  <property name="activates_default">False</property>
-				  <accessibility>
-				    <atkrelation target="text_program_radio" type="labelled-by"/>
-				    <atkrelation target="text_program_radio" type="controlled-by"/>
-				  </accessibility>
-				  <signal name="activate" handler="pref_changed_cb" last_modification_time="Sun, 20 Mar 2005 21:32:42 GMT"/>
-				  <signal name="focus_out_event" handler="pref_changed_event_cb" last_modification_time="Sun, 20 Mar 2005 21:33:43 GMT"/>
-				</widget>
-				<packing>
-				  <property name="left_attach">1</property>
-				  <property name="right_attach">3</property>
-				  <property name="top_attach">1</property>
-				  <property name="bottom_attach">2</property>
-				  <property name="y_options"></property>
-				</packing>
-			      </child>
-
-			      <child>
-				<widget class="GtkEntry" id="text_program_entry">
-				  <property name="visible">True</property>
-				  <property name="tooltip" translatable="yes">Text-displaying modes will display the output of this program.</property>
-				  <property name="can_focus">True</property>
-				  <property name="editable">True</property>
-				  <property name="visibility">True</property>
-				  <property name="max_length">0</property>
-				  <property name="text" translatable="yes"></property>
-				  <property name="has_frame">True</property>
-				  <property name="invisible_char">*</property>
-				  <property name="activates_default">False</property>
-				  <accessibility>
-				    <atkrelation target="text_program_radio" type="labelled-by"/>
-				    <atkrelation target="text_program_radio" type="controlled-by"/>
-				  </accessibility>
-				  <signal name="activate" handler="pref_changed_cb" last_modification_time="Sun, 20 Mar 2005 21:33:02 GMT"/>
-				  <signal name="focus_out_event" handler="pref_changed_event_cb" last_modification_time="Sun, 20 Mar 2005 21:34:15 GMT"/>
-				</widget>
-				<packing>
-				  <property name="left_attach">1</property>
-				  <property name="right_attach">2</property>
-				  <property name="top_attach">3</property>
-				  <property name="bottom_attach">4</property>
-				  <property name="y_options"></property>
-				</packing>
-			      </child>
-
-			      <child>
-				<widget class="GtkButton" id="text_program_browse">
-				  <property name="visible">True</property>
-				  <property name="can_focus">True</property>
-				  <property name="label" translatable="yes">_Browse</property>
-				  <property name="use_underline">True</property>
-				  <property name="relief">GTK_RELIEF_NORMAL</property>
-				  <property name="focus_on_click">True</property>
-				  <accessibility>
-				    <atkrelation target="text_program_radio" type="controller-for"/>
-				  </accessibility>
-				  <signal name="clicked" handler="browse_text_program_cb" last_modification_time="Sun, 20 Mar 2005 01:24:51 GMT"/>
-				</widget>
-				<packing>
-				  <property name="left_attach">2</property>
-				  <property name="right_attach">3</property>
-				  <property name="top_attach">3</property>
-				  <property name="bottom_attach">4</property>
-				  <property name="x_options">fill</property>
-				  <property name="y_options"></property>
-				</packing>
-			      </child>
-
-			      <child>
-				<widget class="GtkEntry" id="text_file_entry">
-				  <property name="visible">True</property>
-				  <property name="tooltip" translatable="yes">Text-displaying modes will display the contents of this file.</property>
-				  <property name="can_focus">True</property>
-				  <property name="editable">True</property>
-				  <property name="visibility">True</property>
-				  <property name="max_length">0</property>
-				  <property name="text" translatable="yes"></property>
-				  <property name="has_frame">True</property>
-				  <property name="invisible_char">*</property>
-				  <property name="activates_default">False</property>
-				  <accessibility>
-				    <atkrelation target="text_file_radio" type="labelled-by"/>
-				    <atkrelation target="text_file_radio" type="controlled-by"/>
-				  </accessibility>
-				  <signal name="activate" handler="pref_changed_cb" last_modification_time="Sun, 20 Mar 2005 21:32:53 GMT"/>
-				  <signal name="focus_out_event" handler="pref_changed_event_cb" last_modification_time="Sun, 20 Mar 2005 21:33:55 GMT"/>
-				</widget>
-				<packing>
-				  <property name="left_attach">1</property>
-				  <property name="right_attach">2</property>
-				  <property name="top_attach">2</property>
-				  <property name="bottom_attach">3</property>
-				  <property name="y_options"></property>
-				</packing>
-			      </child>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">True</property>
-			      <property name="fill">True</property>
-			    </packing>
-			  </child>
-			</widget>
-		      </child>
-
-		      <child>
-			<widget class="GtkLabel" id="label3">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">Text Manipulation</property>
-			  <property name="use_underline">False</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0.5</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-			  <property name="width_chars">-1</property>
-			  <property name="single_line_mode">False</property>
-			  <property name="angle">0</property>
-			  <accessibility>
-			    <atkrelation target="diag_frame" type="label-for"/>
-			  </accessibility>
-			</widget>
-			<packing>
-			  <property name="type">label_item</property>
-			</packing>
-		      </child>
-		    </widget>
-		    <packing>
-		      <property name="left_attach">0</property>
-		      <property name="right_attach">1</property>
-		      <property name="top_attach">1</property>
-		      <property name="bottom_attach">2</property>
-		      <property name="x_options">fill</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkFrame" id="dpms_frame">
-		      <property name="border_width">10</property>
-		      <property name="visible">True</property>
-		      <property name="label_xalign">0</property>
-		      <property name="label_yalign">0.5</property>
-		      <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
-
-		      <child>
-			<widget class="GtkHBox" id="dpms_hbox">
-			  <property name="border_width">8</property>
-			  <property name="visible">True</property>
-			  <property name="homogeneous">False</property>
-			  <property name="spacing">8</property>
-
-			  <child>
-			    <widget class="GtkImage" id="dpms_logo">
-			      <property name="visible">True</property>
-			      <property name="pixbuf">screensaver-power.png</property>
-			      <property name="xalign">0.5</property>
-			      <property name="yalign">0</property>
-			      <property name="xpad">0</property>
-			      <property name="ypad">0</property>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkVBox" id="vbox6">
-			      <property name="visible">True</property>
-			      <property name="homogeneous">False</property>
-			      <property name="spacing">0</property>
-
-			      <child>
-				<widget class="GtkCheckButton" id="dpms_button">
-				  <property name="visible">True</property>
-				  <property name="tooltip" translatable="yes">Whether the monitor should be powered down after a while.</property>
-				  <property name="can_focus">True</property>
-				  <property name="label" translatable="yes">_Power Management Enabled</property>
-				  <property name="use_underline">True</property>
-				  <property name="relief">GTK_RELIEF_NORMAL</property>
-				  <property name="focus_on_click">True</property>
-				  <property name="active">True</property>
-				  <property name="inconsistent">False</property>
-				  <property name="draw_indicator">True</property>
-				  <accessibility>
-				    <atkrelation target="dpms_suspend_spinbutton" type="controller-for"/>
-				    <atkrelation target="dpms_standby_spinbutton" type="controller-for"/>
-				    <atkrelation target="dpms_off_spinbutton" type="controller-for"/>
-				  </accessibility>
-				  <signal name="toggled" handler="pref_changed_cb"/>
-				</widget>
-				<packing>
-				  <property name="padding">0</property>
-				  <property name="expand">False</property>
-				  <property name="fill">False</property>
-				</packing>
-			      </child>
-
-			      <child>
-				<widget class="GtkTable" id="dpms_table">
-				  <property name="visible">True</property>
-				  <property name="n_rows">3</property>
-				  <property name="n_columns">3</property>
-				  <property name="homogeneous">False</property>
-				  <property name="row_spacing">2</property>
-				  <property name="column_spacing">4</property>
-
-				  <child>
-				    <widget class="GtkLabel" id="dpms_standby_label">
-				      <property name="visible">True</property>
-				      <property name="label" translatable="yes">Stand_by After</property>
-				      <property name="use_underline">True</property>
-				      <property name="use_markup">False</property>
-				      <property name="justify">GTK_JUSTIFY_LEFT</property>
-				      <property name="wrap">False</property>
-				      <property name="selectable">False</property>
-				      <property name="xalign">1</property>
-				      <property name="yalign">0.5</property>
-				      <property name="xpad">10</property>
-				      <property name="ypad">0</property>
-				      <property name="mnemonic_widget">dpms_standby_spinbutton</property>
-				      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-				      <property name="width_chars">-1</property>
-				      <property name="single_line_mode">False</property>
-				      <property name="angle">0</property>
-				      <accessibility>
-					<atkrelation target="dpms_standby_spinbutton" type="label-for"/>
-					<atkrelation target="dpms_standby_spinbutton" type="flows-to"/>
-				      </accessibility>
-				    </widget>
-				    <packing>
-				      <property name="left_attach">0</property>
-				      <property name="right_attach">1</property>
-				      <property name="top_attach">0</property>
-				      <property name="bottom_attach">1</property>
-				      <property name="x_options">fill</property>
-				      <property name="y_options"></property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkLabel" id="dpms_suspend_label">
-				      <property name="visible">True</property>
-				      <property name="label" translatable="yes">Sus_pend After</property>
-				      <property name="use_underline">True</property>
-				      <property name="use_markup">False</property>
-				      <property name="justify">GTK_JUSTIFY_LEFT</property>
-				      <property name="wrap">False</property>
-				      <property name="selectable">False</property>
-				      <property name="xalign">1</property>
-				      <property name="yalign">0.5</property>
-				      <property name="xpad">10</property>
-				      <property name="ypad">0</property>
-				      <property name="mnemonic_widget">dpms_suspend_spinbutton</property>
-				      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-				      <property name="width_chars">-1</property>
-				      <property name="single_line_mode">False</property>
-				      <property name="angle">0</property>
-				      <accessibility>
-					<atkrelation target="dpms_suspend_spinbutton" type="label-for"/>
-					<atkrelation target="dpms_suspend_spinbutton" type="flows-to"/>
-				      </accessibility>
-				    </widget>
-				    <packing>
-				      <property name="left_attach">0</property>
-				      <property name="right_attach">1</property>
-				      <property name="top_attach">1</property>
-				      <property name="bottom_attach">2</property>
-				      <property name="x_options">fill</property>
-				      <property name="y_options"></property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkLabel" id="dpms_off_label">
-				      <property name="visible">True</property>
-				      <property name="label" translatable="yes">_Off After</property>
-				      <property name="use_underline">True</property>
-				      <property name="use_markup">False</property>
-				      <property name="justify">GTK_JUSTIFY_LEFT</property>
-				      <property name="wrap">False</property>
-				      <property name="selectable">False</property>
-				      <property name="xalign">1</property>
-				      <property name="yalign">0.5</property>
-				      <property name="xpad">10</property>
-				      <property name="ypad">0</property>
-				      <property name="mnemonic_widget">dpms_off_spinbutton</property>
-				      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-				      <property name="width_chars">-1</property>
-				      <property name="single_line_mode">False</property>
-				      <property name="angle">0</property>
-				      <accessibility>
-					<atkrelation target="dpms_off_spinbutton" type="label-for"/>
-					<atkrelation target="dpms_off_spinbutton" type="flows-to"/>
-				      </accessibility>
-				    </widget>
-				    <packing>
-				      <property name="left_attach">0</property>
-				      <property name="right_attach">1</property>
-				      <property name="top_attach">2</property>
-				      <property name="bottom_attach">3</property>
-				      <property name="x_options">fill</property>
-				      <property name="y_options"></property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkLabel" id="dpms_standby_mlabel">
-				      <property name="visible">True</property>
-				      <property name="label" translatable="yes">minutes</property>
-				      <property name="use_underline">False</property>
-				      <property name="use_markup">False</property>
-				      <property name="justify">GTK_JUSTIFY_LEFT</property>
-				      <property name="wrap">False</property>
-				      <property name="selectable">False</property>
-				      <property name="xalign">0</property>
-				      <property name="yalign">0.5</property>
-				      <property name="xpad">0</property>
-				      <property name="ypad">0</property>
-				      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-				      <property name="width_chars">-1</property>
-				      <property name="single_line_mode">False</property>
-				      <property name="angle">0</property>
-				      <accessibility>
-					<atkrelation target="dpms_standby_spinbutton" type="label-for"/>
-					<atkrelation target="dpms_standby_spinbutton" type="flows-from"/>
-				      </accessibility>
-				    </widget>
-				    <packing>
-				      <property name="left_attach">2</property>
-				      <property name="right_attach">3</property>
-				      <property name="top_attach">0</property>
-				      <property name="bottom_attach">1</property>
-				      <property name="x_options">fill</property>
-				      <property name="y_options"></property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkLabel" id="dpms_suspend_mlabel">
-				      <property name="visible">True</property>
-				      <property name="label" translatable="yes">minutes</property>
-				      <property name="use_underline">False</property>
-				      <property name="use_markup">False</property>
-				      <property name="justify">GTK_JUSTIFY_LEFT</property>
-				      <property name="wrap">False</property>
-				      <property name="selectable">False</property>
-				      <property name="xalign">0</property>
-				      <property name="yalign">0.5</property>
-				      <property name="xpad">0</property>
-				      <property name="ypad">0</property>
-				      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-				      <property name="width_chars">-1</property>
-				      <property name="single_line_mode">False</property>
-				      <property name="angle">0</property>
-				      <accessibility>
-					<atkrelation target="dpms_suspend_spinbutton" type="label-for"/>
-					<atkrelation target="dpms_suspend_spinbutton" type="flows-from"/>
-				      </accessibility>
-				    </widget>
-				    <packing>
-				      <property name="left_attach">2</property>
-				      <property name="right_attach">3</property>
-				      <property name="top_attach">1</property>
-				      <property name="bottom_attach">2</property>
-				      <property name="x_options">fill</property>
-				      <property name="y_options"></property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkLabel" id="dpms_off_mlabel">
-				      <property name="visible">True</property>
-				      <property name="label" translatable="yes">minutes</property>
-				      <property name="use_underline">False</property>
-				      <property name="use_markup">False</property>
-				      <property name="justify">GTK_JUSTIFY_LEFT</property>
-				      <property name="wrap">False</property>
-				      <property name="selectable">False</property>
-				      <property name="xalign">0</property>
-				      <property name="yalign">0.5</property>
-				      <property name="xpad">0</property>
-				      <property name="ypad">0</property>
-				      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-				      <property name="width_chars">-1</property>
-				      <property name="single_line_mode">False</property>
-				      <property name="angle">0</property>
-				      <accessibility>
-					<atkrelation target="dpms_off_spinbutton" type="label-for"/>
-					<atkrelation target="dpms_off_spinbutton" type="flows-from"/>
-				      </accessibility>
-				    </widget>
-				    <packing>
-				      <property name="left_attach">2</property>
-				      <property name="right_attach">3</property>
-				      <property name="top_attach">2</property>
-				      <property name="bottom_attach">3</property>
-				      <property name="x_options">fill</property>
-				      <property name="y_options"></property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkSpinButton" id="dpms_off_spinbutton">
-				      <property name="visible">True</property>
-				      <property name="tooltip" translatable="yes">How long until the monitor powers down.</property>
-				      <property name="can_focus">True</property>
-				      <property name="climb_rate">15</property>
-				      <property name="digits">0</property>
-				      <property name="numeric">True</property>
-				      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
-				      <property name="snap_to_ticks">True</property>
-				      <property name="wrap">False</property>
-				      <property name="adjustment">0 0 1440 1 15 0</property>
-				      <accessibility>
-					<atkrelation target="dpms_button" type="controlled-by"/>
-					<atkrelation target="dpms_off_label" type="labelled-by"/>
-					<atkrelation target="dpms_off_mlabel" type="labelled-by"/>
-					<atkrelation target="dpms_off_label" type="flows-from"/>
-					<atkrelation target="dpms_off_mlabel" type="flows-to"/>
-				      </accessibility>
-				      <signal name="activate" handler="pref_changed_cb"/>
-				      <signal name="focus_out_event" handler="pref_changed_event_cb"/>
-				      <signal name="value_changed" handler="pref_changed_cb"/>
-				    </widget>
-				    <packing>
-				      <property name="left_attach">1</property>
-				      <property name="right_attach">2</property>
-				      <property name="top_attach">2</property>
-				      <property name="bottom_attach">3</property>
-				      <property name="x_options"></property>
-				      <property name="y_options"></property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkSpinButton" id="dpms_suspend_spinbutton">
-				      <property name="visible">True</property>
-				      <property name="tooltip" translatable="yes">How long until the monitor goes into power-saving mode.</property>
-				      <property name="can_focus">True</property>
-				      <property name="climb_rate">15</property>
-				      <property name="digits">0</property>
-				      <property name="numeric">True</property>
-				      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
-				      <property name="snap_to_ticks">True</property>
-				      <property name="wrap">False</property>
-				      <property name="adjustment">0 0 1440 1 15 0</property>
-				      <accessibility>
-					<atkrelation target="dpms_button" type="controlled-by"/>
-					<atkrelation target="dpms_suspend_label" type="labelled-by"/>
-					<atkrelation target="dpms_suspend_mlabel" type="labelled-by"/>
-					<atkrelation target="dpms_suspend_label" type="flows-from"/>
-					<atkrelation target="dpms_suspend_mlabel" type="flows-to"/>
-				      </accessibility>
-				      <signal name="activate" handler="pref_changed_cb"/>
-				      <signal name="focus_out_event" handler="pref_changed_event_cb"/>
-				      <signal name="value_changed" handler="pref_changed_cb"/>
-				    </widget>
-				    <packing>
-				      <property name="left_attach">1</property>
-				      <property name="right_attach">2</property>
-				      <property name="top_attach">1</property>
-				      <property name="bottom_attach">2</property>
-				      <property name="x_options"></property>
-				      <property name="y_options"></property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkSpinButton" id="dpms_standby_spinbutton">
-				      <property name="visible">True</property>
-				      <property name="tooltip" translatable="yes">How long until the monitor goes completely black.</property>
-				      <property name="can_focus">True</property>
-				      <property name="climb_rate">15</property>
-				      <property name="digits">0</property>
-				      <property name="numeric">True</property>
-				      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
-				      <property name="snap_to_ticks">True</property>
-				      <property name="wrap">False</property>
-				      <property name="adjustment">0 0 1440 1 15 0</property>
-				      <accessibility>
-					<atkrelation target="dpms_button" type="controlled-by"/>
-					<atkrelation target="dpms_standby_label" type="labelled-by"/>
-					<atkrelation target="dpms_standby_mlabel" type="labelled-by"/>
-					<atkrelation target="dpms_standby_label" type="flows-from"/>
-					<atkrelation target="dpms_standby_mlabel" type="flows-to"/>
-				      </accessibility>
-				      <signal name="activate" handler="pref_changed_cb"/>
-				      <signal name="focus_out_event" handler="pref_changed_event_cb"/>
-				      <signal name="value_changed" handler="pref_changed_cb"/>
-				    </widget>
-				    <packing>
-				      <property name="left_attach">1</property>
-				      <property name="right_attach">2</property>
-				      <property name="top_attach">0</property>
-				      <property name="bottom_attach">1</property>
-				      <property name="x_options"></property>
-				      <property name="y_options"></property>
-				    </packing>
-				  </child>
-				</widget>
-				<packing>
-				  <property name="padding">0</property>
-				  <property name="expand">False</property>
-				  <property name="fill">True</property>
-				</packing>
-			      </child>
-
-			      <child>
-				<widget class="GtkCheckButton" id="dpms_quickoff_button">
-				  <property name="visible">True</property>
-				  <property name="tooltip" translatable="yes">Whether the monitor should be powered off immediately in "Blank Screen Only" mode, regardless of the above power-management timeouts.</property>
-				  <property name="can_focus">True</property>
-				  <property name="label" translatable="yes">_Quick Power-off in Blank Only Mode</property>
-				  <property name="use_underline">True</property>
-				  <property name="relief">GTK_RELIEF_NORMAL</property>
-				  <property name="focus_on_click">True</property>
-				  <property name="active">False</property>
-				  <property name="inconsistent">False</property>
-				  <property name="draw_indicator">True</property>
-				  <signal name="toggled" handler="pref_changed_cb"/>
-				</widget>
-				<packing>
-				  <property name="padding">0</property>
-				  <property name="expand">False</property>
-				  <property name="fill">False</property>
-				</packing>
-			      </child>
-
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">True</property>
-			      <property name="fill">True</property>
-			    </packing>
-			  </child>
-			</widget>
-		      </child>
-
-		      <child>
-			<widget class="GtkLabel" id="label4">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">Display Power Management</property>
-			  <property name="use_underline">False</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0.5</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-			  <property name="width_chars">-1</property>
-			  <property name="single_line_mode">False</property>
-			  <property name="angle">0</property>
-			  <accessibility>
-			    <atkrelation target="dpms_frame" type="label-for"/>
-			  </accessibility>
-			</widget>
-			<packing>
-			  <property name="type">label_item</property>
-			</packing>
-		      </child>
-		    </widget>
-		    <packing>
-		      <property name="left_attach">1</property>
-		      <property name="right_attach">2</property>
-		      <property name="top_attach">0</property>
-		      <property name="bottom_attach">1</property>
-		      <property name="y_options">fill</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkFrame" id="cmap_frame">
-		      <property name="border_width">10</property>
-		      <property name="visible">True</property>
-		      <property name="label_xalign">0</property>
-		      <property name="label_yalign">0.5</property>
-		      <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
-		      <accessibility>
-			<atkrelation target="label5" type="labelled-by"/>
-		      </accessibility>
-
-		      <child>
-			<widget class="GtkHBox" id="cmap_hbox">
-			  <property name="border_width">8</property>
-			  <property name="visible">True</property>
-			  <property name="homogeneous">False</property>
-			  <property name="spacing">8</property>
-
-			  <child>
-			    <widget class="GtkImage" id="image5">
-			      <property name="visible">True</property>
-			      <property name="pixbuf">screensaver-colorselector.png</property>
-			      <property name="xalign">0.5</property>
-			      <property name="yalign">0</property>
-			      <property name="xpad">0</property>
-			      <property name="ypad">0</property>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkVBox" id="vbox7">
-			      <property name="visible">True</property>
-			      <property name="homogeneous">False</property>
-			      <property name="spacing">0</property>
-
-			      <child>
-				<widget class="GtkCheckButton" id="fade_button">
-				  <property name="visible">True</property>
-				  <property name="tooltip" translatable="yes">Whether the screen should slowly fade to black when the screen saver activates.</property>
-				  <property name="can_focus">True</property>
-				  <property name="label" translatable="yes">Fade to Black when _Blanking</property>
-				  <property name="use_underline">True</property>
-				  <property name="relief">GTK_RELIEF_NORMAL</property>
-				  <property name="focus_on_click">True</property>
-				  <property name="active">False</property>
-				  <property name="inconsistent">False</property>
-				  <property name="draw_indicator">True</property>
-				  <accessibility>
-				    <atkrelation target="fade_spinbutton" type="controller-for"/>
-				  </accessibility>
-				  <signal name="toggled" handler="pref_changed_cb"/>
-				</widget>
-				<packing>
-				  <property name="padding">0</property>
-				  <property name="expand">False</property>
-				  <property name="fill">False</property>
-				</packing>
-			      </child>
-
-			      <child>
-				<widget class="GtkCheckButton" id="unfade_button">
-				  <property name="visible">True</property>
-				  <property name="tooltip" translatable="yes">Whether the screen should slowly fade in from black when the screen saver deactivates.</property>
-				  <property name="can_focus">True</property>
-				  <property name="label" translatable="yes">Fade from Black When _Unblanking</property>
-				  <property name="use_underline">True</property>
-				  <property name="relief">GTK_RELIEF_NORMAL</property>
-				  <property name="focus_on_click">True</property>
-				  <property name="active">False</property>
-				  <property name="inconsistent">False</property>
-				  <property name="draw_indicator">True</property>
-				  <accessibility>
-				    <atkrelation target="fade_spinbutton" type="controller-for"/>
-				  </accessibility>
-				  <signal name="toggled" handler="pref_changed_cb"/>
-				</widget>
-				<packing>
-				  <property name="padding">0</property>
-				  <property name="expand">False</property>
-				  <property name="fill">False</property>
-				</packing>
-			      </child>
-
-			      <child>
-				<widget class="GtkHBox" id="fade_hbox">
-				  <property name="visible">True</property>
-				  <property name="homogeneous">False</property>
-				  <property name="spacing">0</property>
-
-				  <child>
-				    <widget class="GtkLabel" id="fade_dummy">
-				      <property name="visible">True</property>
-				      <property name="label" translatable="yes"></property>
-				      <property name="use_underline">False</property>
-				      <property name="use_markup">False</property>
-				      <property name="justify">GTK_JUSTIFY_LEFT</property>
-				      <property name="wrap">False</property>
-				      <property name="selectable">False</property>
-				      <property name="xalign">0.5</property>
-				      <property name="yalign">0.5</property>
-				      <property name="xpad">3</property>
-				      <property name="ypad">0</property>
-				      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-				      <property name="width_chars">-1</property>
-				      <property name="single_line_mode">False</property>
-				      <property name="angle">0</property>
-				    </widget>
-				    <packing>
-				      <property name="padding">0</property>
-				      <property name="expand">False</property>
-				      <property name="fill">False</property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkLabel" id="fade_label">
-				      <property name="visible">True</property>
-				      <property name="label" translatable="yes">F_ade Duration</property>
-				      <property name="use_underline">True</property>
-				      <property name="use_markup">False</property>
-				      <property name="justify">GTK_JUSTIFY_LEFT</property>
-				      <property name="wrap">False</property>
-				      <property name="selectable">False</property>
-				      <property name="xalign">0</property>
-				      <property name="yalign">0.5</property>
-				      <property name="xpad">0</property>
-				      <property name="ypad">0</property>
-				      <property name="mnemonic_widget">fade_spinbutton</property>
-				      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-				      <property name="width_chars">-1</property>
-				      <property name="single_line_mode">False</property>
-				      <property name="angle">0</property>
-				      <accessibility>
-					<atkrelation target="fade_spinbutton" type="label-for"/>
-					<atkrelation target="fade_spinbutton" type="flows-to"/>
-				      </accessibility>
-				    </widget>
-				    <packing>
-				      <property name="padding">14</property>
-				      <property name="expand">False</property>
-				      <property name="fill">False</property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkSpinButton" id="fade_spinbutton">
-				      <property name="visible">True</property>
-				      <property name="tooltip" translatable="yes">How long it should take for the screen to fade in and out.</property>
-				      <property name="can_focus">True</property>
-				      <property name="climb_rate">1</property>
-				      <property name="digits">0</property>
-				      <property name="numeric">True</property>
-				      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
-				      <property name="snap_to_ticks">True</property>
-				      <property name="wrap">False</property>
-				      <property name="adjustment">0 0 10 1 1 0</property>
-				      <accessibility>
-					<atkrelation target="unfade_button" type="controlled-by"/>
-					<atkrelation target="fade_button" type="controlled-by"/>
-					<atkrelation target="fade_label" type="labelled-by"/>
-					<atkrelation target="fade_sec_label" type="labelled-by"/>
-					<atkrelation target="fade_label" type="flows-from"/>
-					<atkrelation target="fade_sec_label" type="flows-to"/>
-				      </accessibility>
-				      <signal name="activate" handler="pref_changed_cb"/>
-				      <signal name="focus_out_event" handler="pref_changed_event_cb"/>
-				      <signal name="value_changed" handler="pref_changed_cb"/>
-				    </widget>
-				    <packing>
-				      <property name="padding">4</property>
-				      <property name="expand">False</property>
-				      <property name="fill">False</property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkLabel" id="fade_sec_label">
-				      <property name="visible">True</property>
-				      <property name="label" translatable="yes">seconds</property>
-				      <property name="use_underline">False</property>
-				      <property name="use_markup">False</property>
-				      <property name="justify">GTK_JUSTIFY_LEFT</property>
-				      <property name="wrap">False</property>
-				      <property name="selectable">False</property>
-				      <property name="xalign">0</property>
-				      <property name="yalign">0.5</property>
-				      <property name="xpad">0</property>
-				      <property name="ypad">0</property>
-				      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-				      <property name="width_chars">-1</property>
-				      <property name="single_line_mode">False</property>
-				      <property name="angle">0</property>
-				      <accessibility>
-					<atkrelation target="fade_spinbutton" type="label-for"/>
-					<atkrelation target="fade_spinbutton" type="flows-from"/>
-				      </accessibility>
-				    </widget>
-				    <packing>
-				      <property name="padding">2</property>
-				      <property name="expand">False</property>
-				      <property name="fill">False</property>
-				    </packing>
-				  </child>
-				</widget>
-				<packing>
-				  <property name="padding">0</property>
-				  <property name="expand">False</property>
-				  <property name="fill">False</property>
-				</packing>
-			      </child>
-
-			      <child>
-				<widget class="GtkHSeparator" id="cmap_hr">
-				  <property name="visible">True</property>
-				</widget>
-				<packing>
-				  <property name="padding">8</property>
-				  <property name="expand">False</property>
-				  <property name="fill">False</property>
-				</packing>
-			      </child>
-
-			      <child>
-				<widget class="GtkCheckButton" id="install_button">
-				  <property name="visible">True</property>
-				  <property name="tooltip" translatable="yes">Whether to install a private colormap when running in 8-bit mode on the default Visual.</property>
-				  <property name="can_focus">True</property>
-				  <property name="label" translatable="yes">Install _Colormap</property>
-				  <property name="use_underline">True</property>
-				  <property name="relief">GTK_RELIEF_NORMAL</property>
-				  <property name="focus_on_click">True</property>
-				  <property name="active">False</property>
-				  <property name="inconsistent">False</property>
-				  <property name="draw_indicator">True</property>
-				  <signal name="toggled" handler="pref_changed_cb"/>
-				</widget>
-				<packing>
-				  <property name="padding">0</property>
-				  <property name="expand">False</property>
-				  <property name="fill">False</property>
-				</packing>
-			      </child>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">True</property>
-			      <property name="fill">True</property>
-			    </packing>
-			  </child>
-			</widget>
-		      </child>
-
-		      <child>
-			<widget class="GtkLabel" id="label5">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">Fading and Colormaps</property>
-			  <property name="use_underline">False</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0.5</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-			  <property name="width_chars">-1</property>
-			  <property name="single_line_mode">False</property>
-			  <property name="angle">0</property>
-			  <accessibility>
-			    <atkrelation target="cmap_frame" type="label-for"/>
-			  </accessibility>
-			</widget>
-			<packing>
-			  <property name="type">label_item</property>
-			</packing>
-		      </child>
-		    </widget>
-		    <packing>
-		      <property name="left_attach">1</property>
-		      <property name="right_attach">2</property>
-		      <property name="top_attach">1</property>
-		      <property name="bottom_attach">2</property>
-		      <property name="x_options">fill</property>
-		      <property name="y_options">fill</property>
-		    </packing>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="tab_expand">False</property>
-		  <property name="tab_fill">True</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkLabel" id="options_tab">
-		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">_Advanced</property>
-		  <property name="use_underline">True</property>
-		  <property name="use_markup">False</property>
-		  <property name="justify">GTK_JUSTIFY_LEFT</property>
-		  <property name="wrap">False</property>
-		  <property name="selectable">False</property>
-		  <property name="xalign">0.5</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">0</property>
-		  <property name="ypad">0</property>
-		  <property name="mnemonic_widget">notebook</property>
-		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-		  <property name="width_chars">-1</property>
-		  <property name="single_line_mode">False</property>
-		  <property name="angle">0</property>
-		</widget>
-		<packing>
-		  <property name="type">tab</property>
-		</packing>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">True</property>
-	      <property name="fill">True</property>
-	    </packing>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">True</property>
-	  <property name="fill">True</property>
-	</packing>
-      </child>
-
-      <child>
-	<widget class="GtkHButtonBox" id="hbuttonbox2">
-	  <property name="border_width">5</property>
-	  <property name="layout_style">GTK_BUTTONBOX_EDGE</property>
-	  <property name="spacing">10</property>
-
-	  <child>
-	    <widget class="GtkButton" id="helpbutton">
-	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label">gtk-help</property>
-	      <property name="use_stock">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="focus_on_click">True</property>
-	      <signal name="clicked" handler="doc_menu_cb"/>
-	    </widget>
-	  </child>
-
-	  <child>
-	    <widget class="GtkButton" id="closebutton">
-	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label">gtk-close</property>
-	      <property name="use_stock">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="focus_on_click">True</property>
-	      <signal name="clicked" handler="exit_menu_cb"/>
-	    </widget>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">False</property>
-	  <property name="fill">True</property>
-	  <property name="pack_type">GTK_PACK_END</property>
-	</packing>
-      </child>
-    </widget>
-  </child>
-</widget>
-
-<widget class="GtkDialog" id="xscreensaver_settings_dialog">
-  <property name="title" translatable="yes">dialog1</property>
-  <property name="type">GTK_WINDOW_TOPLEVEL</property>
-  <property name="window_position">GTK_WIN_POS_NONE</property>
-  <property name="modal">False</property>
-  <property name="resizable">True</property>
-  <property name="destroy_with_parent">False</property>
-  <property name="decorated">True</property>
-  <property name="skip_taskbar_hint">False</property>
-  <property name="skip_pager_hint">False</property>
-  <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
-  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
-  <property name="focus_on_map">True</property>
-  <property name="urgency_hint">False</property>
-  @COMMENT_DEMO_GLADE2_GTK_2_22_HEAD@<property name="has_separator">False</property>@COMMENT_DEMO_GLADE2_GTK_2_22_TAIL@
-
-  <child internal-child="vbox">
-    <widget class="GtkVBox" id="dialog_vbox">
-      <property name="visible">True</property>
-      <property name="homogeneous">False</property>
-      <property name="spacing">0</property>
-
-      <child internal-child="action_area">
-	<widget class="GtkHButtonBox" id="dialog_action_area">
-	  <property name="visible">True</property>
-	  <property name="layout_style">GTK_BUTTONBOX_END</property>
-
-	  <child>
-	    <widget class="GtkButton" id="adv_button">
-	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label" translatable="yes">_Advanced &gt;&gt;</property>
-	      <property name="use_underline">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="focus_on_click">True</property>
-	      <property name="response_id">0</property>
-	      <signal name="clicked" handler="settings_adv_cb"/>
-	    </widget>
-	  </child>
-
-	  <child>
-	    <widget class="GtkButton" id="std_button">
-	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label" translatable="yes">_Standard &lt;&lt;</property>
-	      <property name="use_underline">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="focus_on_click">True</property>
-	      <property name="response_id">0</property>
-	      <signal name="clicked" handler="settings_std_cb"/>
-	    </widget>
-	  </child>
-
-	  <child>
-	    <widget class="GtkButton" id="reset_button">
-	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label" translatable="yes">_Reset to Defaults</property>
-	      <property name="use_underline">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="focus_on_click">True</property>
-	      <property name="response_id">0</property>
-	      <signal name="clicked" handler="settings_reset_cb"/>
-	    </widget>
-	  </child>
-
-	  <child>
-	    <widget class="GtkButton" id="cancel_button">
-	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label">gtk-cancel</property>
-	      <property name="use_stock">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="focus_on_click">True</property>
-	      <property name="response_id">-6</property>
-	      <signal name="clicked" handler="settings_cancel_cb"/>
-	    </widget>
-	  </child>
-
-	  <child>
-	    <widget class="GtkButton" id="ok_button">
-	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label">gtk-ok</property>
-	      <property name="use_stock">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="focus_on_click">True</property>
-	      <property name="response_id">-5</property>
-	      <signal name="clicked" handler="settings_ok_cb"/>
-	    </widget>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">False</property>
-	  <property name="fill">True</property>
-	  <property name="pack_type">GTK_PACK_END</property>
-	</packing>
-      </child>
-
-      <child>
-	<widget class="GtkVBox" id="vbox1">
-	  <property name="visible">True</property>
-	  <property name="homogeneous">False</property>
-	  <property name="spacing">0</property>
-
-	  <child>
-	    <widget class="GtkFrame" id="opt_frame">
-	      <property name="visible">True</property>
-	      <property name="label_xalign">0</property>
-	      <property name="label_yalign">0</property>
-	      <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
-	      <accessibility>
-		<atkrelation target="label6" type="labelled-by"/>
-	      </accessibility>
-
-	      <child>
-		<widget class="GtkNotebook" id="opt_notebook">
-		  <property name="border_width">12</property>
-		  <property name="visible">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="show_tabs">True</property>
-		  <property name="show_border">False</property>
-		  <property name="tab_pos">GTK_POS_BOTTOM</property>
-		  <property name="scrollable">False</property>
-		  <property name="enable_popup">False</property>
-		  <signal name="switch_page" handler="settings_switch_page_cb"/>
-
-		  <child>
-		    <widget class="GtkVBox" id="settings_vbox">
-		      <property name="visible">True</property>
-		      <property name="homogeneous">False</property>
-		      <property name="spacing">0</property>
-
-		      <child>
-			<placeholder/>
-		      </child>
-		    </widget>
-		    <packing>
-		      <property name="tab_expand">True</property>
-		      <property name="tab_fill">True</property>
-		      <property name="tab_pack">GTK_PACK_END</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkLabel" id="std_label">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">Standard</property>
-		      <property name="use_underline">False</property>
-		      <property name="use_markup">False</property>
-		      <property name="justify">GTK_JUSTIFY_LEFT</property>
-		      <property name="wrap">False</property>
-		      <property name="selectable">False</property>
-		      <property name="xalign">0.5</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xpad">0</property>
-		      <property name="ypad">0</property>
-		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-		      <property name="width_chars">-1</property>
-		      <property name="single_line_mode">False</property>
-		      <property name="angle">0</property>
-		    </widget>
-		    <packing>
-		      <property name="type">tab</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkTable" id="adv_table">
-		      <property name="visible">True</property>
-		      <property name="n_rows">4</property>
-		      <property name="n_columns">2</property>
-		      <property name="homogeneous">False</property>
-		      <property name="row_spacing">0</property>
-		      <property name="column_spacing">0</property>
-
-		      <child>
-			<widget class="GtkImage" id="cmd_logo">
-			  <property name="visible">True</property>
-			  <property name="pixbuf">screensaver-cmndln.png</property>
-			  <property name="xalign">0.5</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">4</property>
-			  <property name="ypad">8</property>
-			</widget>
-			<packing>
-			  <property name="left_attach">0</property>
-			  <property name="right_attach">1</property>
-			  <property name="top_attach">0</property>
-			  <property name="bottom_attach">1</property>
-			  <property name="x_options">fill</property>
-			  <property name="y_options">fill</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkLabel" id="cmd_label">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">_Command Line:</property>
-			  <property name="use_underline">True</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			  <property name="mnemonic_widget">cmd_text</property>
-			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-			  <property name="width_chars">-1</property>
-			  <property name="single_line_mode">False</property>
-			  <property name="angle">0</property>
-			  <accessibility>
-			    <atkrelation target="cmd_text" type="label-for"/>
-			  </accessibility>
-			</widget>
-			<packing>
-			  <property name="left_attach">1</property>
-			  <property name="right_attach">2</property>
-			  <property name="top_attach">1</property>
-			  <property name="bottom_attach">2</property>
-			  <property name="x_options">fill</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkEntry" id="cmd_text">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="editable">True</property>
-			  <property name="visibility">True</property>
-			  <property name="max_length">0</property>
-			  <property name="text" translatable="yes"></property>
-			  <property name="has_frame">True</property>
-			  <property name="invisible_char">*</property>
-			  <property name="activates_default">False</property>
-			  <accessibility>
-			    <atkrelation target="cmd_label" type="labelled-by"/>
-			  </accessibility>
-			</widget>
-			<packing>
-			  <property name="left_attach">1</property>
-			  <property name="right_attach">2</property>
-			  <property name="top_attach">2</property>
-			  <property name="bottom_attach">3</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkHBox" id="visual_hbox">
-			  <property name="visible">True</property>
-			  <property name="homogeneous">False</property>
-			  <property name="spacing">0</property>
-
-			  <child>
-			    <widget class="GtkLabel" id="visual">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">_Visual:</property>
-			      <property name="use_underline">True</property>
-			      <property name="use_markup">False</property>
-			      <property name="justify">GTK_JUSTIFY_LEFT</property>
-			      <property name="wrap">False</property>
-			      <property name="selectable">False</property>
-			      <property name="xalign">1</property>
-			      <property name="yalign">0.5</property>
-			      <property name="xpad">3</property>
-			      <property name="ypad">0</property>
-			      <property name="mnemonic_widget">visual_entry</property>
-			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-			      <property name="width_chars">-1</property>
-			      <property name="single_line_mode">False</property>
-			      <property name="angle">0</property>
-			      <accessibility>
-				<atkrelation target="visual_combo" type="label-for"/>
-			      </accessibility>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkCombo" id="visual_combo">
-			      <property name="visible">True</property>
-			      <property name="value_in_list">False</property>
-			      <property name="allow_empty">True</property>
-			      <property name="case_sensitive">False</property>
-			      <property name="enable_arrow_keys">True</property>
-			      <property name="enable_arrows_always">False</property>
-			      <accessibility>
-				<atkrelation target="visual" type="labelled-by"/>
-			      </accessibility>
-
-			      <child internal-child="entry">
-				<widget class="GtkEntry" id="visual_entry">
-				  <property name="visible">True</property>
-				  <property name="can_focus">True</property>
-				  <property name="editable">True</property>
-				  <property name="visibility">True</property>
-				  <property name="max_length">0</property>
-				  <property name="text" translatable="yes"></property>
-				  <property name="has_frame">True</property>
-				  <property name="invisible_char">*</property>
-				  <property name="activates_default">False</property>
-				</widget>
-			      </child>
-
-			      <child internal-child="list">
-				<widget class="GtkList" id="combo-list1">
-				  <property name="visible">True</property>
-				  <property name="selection_mode">GTK_SELECTION_BROWSE</property>
-
-				  <child>
-				    <widget class="GtkListItem" id="listitem25">
-				      <property name="visible">True</property>
-				      <property name="can_focus">True</property>
-				      <property name="label" translatable="yes">Any</property>
-				    </widget>
-				  </child>
-
-				  <child>
-				    <widget class="GtkListItem" id="listitem26">
-				      <property name="visible">True</property>
-				      <property name="can_focus">True</property>
-				      <property name="label" translatable="yes">Best</property>
-				    </widget>
-				  </child>
-
-				  <child>
-				    <widget class="GtkListItem" id="listitem27">
-				      <property name="visible">True</property>
-				      <property name="can_focus">True</property>
-				      <property name="label" translatable="yes">Default</property>
-				    </widget>
-				  </child>
-
-				  <child>
-				    <widget class="GtkListItem" id="listitem28">
-				      <property name="visible">True</property>
-				      <property name="can_focus">True</property>
-				      <property name="label" translatable="yes">Default-N</property>
-				    </widget>
-				  </child>
-
-				  <child>
-				    <widget class="GtkListItem" id="listitem29">
-				      <property name="visible">True</property>
-				      <property name="can_focus">True</property>
-				      <property name="label" translatable="yes">GL</property>
-				    </widget>
-				  </child>
-
-				  <child>
-				    <widget class="GtkListItem" id="listitem30">
-				      <property name="visible">True</property>
-				      <property name="can_focus">True</property>
-				      <property name="label" translatable="yes">TrueColor</property>
-				    </widget>
-				  </child>
-
-				  <child>
-				    <widget class="GtkListItem" id="listitem31">
-				      <property name="visible">True</property>
-				      <property name="can_focus">True</property>
-				      <property name="label" translatable="yes">PseudoColor</property>
-				    </widget>
-				  </child>
-
-				  <child>
-				    <widget class="GtkListItem" id="listitem32">
-				      <property name="visible">True</property>
-				      <property name="can_focus">True</property>
-				      <property name="label" translatable="yes">StaticGray</property>
-				    </widget>
-				  </child>
-
-				  <child>
-				    <widget class="GtkListItem" id="listitem33">
-				      <property name="visible">True</property>
-				      <property name="can_focus">True</property>
-				      <property name="label" translatable="yes">GrayScale</property>
-				    </widget>
-				  </child>
-
-				  <child>
-				    <widget class="GtkListItem" id="listitem34">
-				      <property name="visible">True</property>
-				      <property name="can_focus">True</property>
-				      <property name="label" translatable="yes">DirectColor</property>
-				    </widget>
-				  </child>
-
-				  <child>
-				    <widget class="GtkListItem" id="listitem35">
-				      <property name="visible">True</property>
-				      <property name="can_focus">True</property>
-				      <property name="label" translatable="yes">Color</property>
-				    </widget>
-				  </child>
-
-				  <child>
-				    <widget class="GtkListItem" id="listitem36">
-				      <property name="visible">True</property>
-				      <property name="can_focus">True</property>
-				      <property name="label" translatable="yes">Gray</property>
-				    </widget>
-				  </child>
-
-				  <child>
-				    <widget class="GtkListItem" id="listitem37">
-				      <property name="visible">True</property>
-				      <property name="can_focus">True</property>
-				      <property name="label" translatable="yes">Mono</property>
-				    </widget>
-				  </child>
-				</widget>
-			      </child>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
-			    </packing>
-			  </child>
-			</widget>
-			<packing>
-			  <property name="left_attach">1</property>
-			  <property name="right_attach">2</property>
-			  <property name="top_attach">3</property>
-			  <property name="bottom_attach">4</property>
-			  <property name="x_options">fill</property>
-			  <property name="y_options">fill</property>
-			</packing>
-		      </child>
-		    </widget>
-		    <packing>
-		      <property name="tab_expand">False</property>
-		      <property name="tab_fill">True</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkLabel" id="adv_label">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">Advanced</property>
-		      <property name="use_underline">False</property>
-		      <property name="use_markup">False</property>
-		      <property name="justify">GTK_JUSTIFY_LEFT</property>
-		      <property name="wrap">False</property>
-		      <property name="selectable">False</property>
-		      <property name="xalign">0.5</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xpad">0</property>
-		      <property name="ypad">0</property>
-		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-		      <property name="width_chars">-1</property>
-		      <property name="single_line_mode">False</property>
-		      <property name="angle">0</property>
-		    </widget>
-		    <packing>
-		      <property name="type">tab</property>
-		    </packing>
-		  </child>
-		</widget>
-	      </child>
-
-	      <child>
-		<widget class="GtkLabel" id="label6">
-		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">Settings</property>
-		  <property name="use_underline">False</property>
-		  <property name="use_markup">False</property>
-		  <property name="justify">GTK_JUSTIFY_LEFT</property>
-		  <property name="wrap">False</property>
-		  <property name="selectable">False</property>
-		  <property name="xalign">0.5</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">0</property>
-		  <property name="ypad">0</property>
-		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-		  <property name="width_chars">-1</property>
-		  <property name="single_line_mode">False</property>
-		  <property name="angle">0</property>
-		  <accessibility>
-		    <atkrelation target="opt_frame" type="label-for"/>
-		  </accessibility>
-		</widget>
-		<packing>
-		  <property name="type">label_item</property>
-		</packing>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">True</property>
-	      <property name="fill">True</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkFrame" id="doc_frame">
-	      <property name="visible">True</property>
-	      <property name="label_xalign">0</property>
-	      <property name="label_yalign">0</property>
-	      <property name="shadow_type">GTK_SHADOW_NONE</property>
-
-	      <child>
-		<widget class="GtkVBox" id="doc_vbox">
-		  <property name="border_width">5</property>
-		  <property name="visible">True</property>
-		  <property name="homogeneous">False</property>
-		  <property name="spacing">5</property>
-
-		  <child>
-		    <widget class="GtkLabel" id="doc">
-		      <property name="visible">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="label" translatable="yes"></property>
-		      <property name="use_underline">False</property>
-		      <property name="use_markup">False</property>
-		      <property name="justify">GTK_JUSTIFY_LEFT</property>
-		      <property name="wrap">True</property>
-		      <property name="selectable">True</property>
-		      <property name="xalign">0</property>
-		      <property name="yalign">0</property>
-		      <property name="xpad">0</property>
-		      <property name="ypad">0</property>
-		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-		      <property name="width_chars">-1</property>
-		      <property name="single_line_mode">False</property>
-		      <property name="angle">0</property>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">True</property>
-		      <property name="fill">True</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkHBox" id="hbox1">
-		      <property name="visible">True</property>
-		      <property name="homogeneous">False</property>
-		      <property name="spacing">0</property>
-
-		      <child>
-			<widget class="GtkButton" id="manual">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="label" translatable="yes">_Documentation...</property>
-			  <property name="use_underline">True</property>
-			  <property name="relief">GTK_RELIEF_NORMAL</property>
-			  <property name="focus_on_click">True</property>
-			  <signal name="clicked" handler="manual_cb"/>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">False</property>
-			  <property name="pack_type">GTK_PACK_END</property>
-			</packing>
-		      </child>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
-		</widget>
-	      </child>
-
-	      <child>
-		<widget class="GtkLabel" id="label7">
-		  <property name="visible">True</property>
-		  <property name="label" translatable="yes"></property>
-		  <property name="use_underline">False</property>
-		  <property name="use_markup">False</property>
-		  <property name="justify">GTK_JUSTIFY_LEFT</property>
-		  <property name="wrap">False</property>
-		  <property name="selectable">False</property>
-		  <property name="xalign">0.5</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">0</property>
-		  <property name="ypad">0</property>
-		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-		  <property name="width_chars">-1</property>
-		  <property name="single_line_mode">False</property>
-		  <property name="angle">0</property>
-		</widget>
-		<packing>
-		  <property name="type">label_item</property>
-		</packing>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">False</property>
-	      <property name="fill">False</property>
-	    </packing>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">True</property>
-	  <property name="fill">True</property>
-	</packing>
-      </child>
-    </widget>
-  </child>
-</widget>
-
-</glade-interface>
diff --git a/driver/xscreensaver-demo.glade2p b/driver/xscreensaver-demo.glade2p
deleted file mode 100644
index 3dfe894..0000000
--- a/driver/xscreensaver-demo.glade2p
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
-<!DOCTYPE glade-project SYSTEM "http://glade.gnome.org/glade-project-2.0.dtd">
-
-<glade-project>
-  <name>XScreenSaver Demo</name>
-  <program_name>xscreensaver-demo</program_name>
-  <source_directory></source_directory>
-  <pixmaps_directory>../utils/images</pixmaps_directory>
-  <use_widget_names>TRUE</use_widget_names>
-  <output_main_file>FALSE</output_main_file>
-  <output_build_files>FALSE</output_build_files>
-  <backup_source_files>FALSE</backup_source_files>
-  <main_source_file>demo-Gtk2-widgets.c</main_source_file>
-  <main_header_file>demo-Gtk2-widgets.h</main_header_file>
-  <handler_source_file>demo-Gtk2-stubs.c</handler_source_file>
-  <handler_header_file>demo-Gtk2-stubs.h</handler_header_file>
-  <support_source_file>demo-Gtk2-support.c</support_source_file>
-  <support_header_file>demo-Gtk2-support.h</support_header_file>
-</glade-project>
diff --git a/driver/xscreensaver-demo.ui b/driver/xscreensaver-demo.ui
new file mode 100644
index 0000000..f40f1c8
--- /dev/null
+++ b/driver/xscreensaver-demo.ui
@@ -0,0 +1,2912 @@
+<?xml version="1.0"?>
+<!--*- mode: xml -*-->
+<interface>
+  <object class="GtkAdjustment" id="adjustment1">
+    <property name="upper">720</property>
+    <property name="lower">1</property>
+    <property name="page_increment">15</property>
+    <property name="step_increment">1</property>
+    <property name="page_size">0</property>
+    <property name="value">1</property>
+  </object>
+  <object class="GtkAdjustment" id="adjustment2">
+    <property name="upper">720</property>
+    <property name="lower">0</property>
+    <property name="page_increment">15</property>
+    <property name="step_increment">1</property>
+    <property name="page_size">0</property>
+    <property name="value">0</property>
+  </object>
+  <object class="GtkAdjustment" id="adjustment3">
+    <property name="upper">720</property>
+    <property name="lower">0</property>
+    <property name="page_increment">15</property>
+    <property name="step_increment">1</property>
+    <property name="page_size">0</property>
+    <property name="value">0</property>
+  </object>
+  <object class="GtkAdjustment" id="adjustment4">
+    <property name="upper">1440</property>
+    <property name="lower">0</property>
+    <property name="page_increment">15</property>
+    <property name="step_increment">1</property>
+    <property name="page_size">0</property>
+    <property name="value">0</property>
+  </object>
+  <object class="GtkAdjustment" id="adjustment5">
+    <property name="upper">1440</property>
+    <property name="lower">0</property>
+    <property name="page_increment">15</property>
+    <property name="step_increment">1</property>
+    <property name="page_size">0</property>
+    <property name="value">0</property>
+  </object>
+  <object class="GtkAdjustment" id="adjustment6">
+    <property name="upper">1440</property>
+    <property name="lower">0</property>
+    <property name="page_increment">15</property>
+    <property name="step_increment">1</property>
+    <property name="page_size">0</property>
+    <property name="value">0</property>
+  </object>
+  <object class="GtkAdjustment" id="adjustment7">
+    <property name="upper">10</property>
+    <property name="lower">0</property>
+    <property name="page_increment">1</property>
+    <property name="step_increment">1</property>
+    <property name="page_size">0</property>
+    <property name="value">0</property>
+  </object>
+  <object class="GtkListStore" id="mode_menu_model">
+    <columns>
+      <column type="gchararray"/>
+    </columns>
+    <data>
+      <row>
+        <col id="0" translatable="yes">Disable Screen Saver</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Blank Screen Only</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Only One Screen Saver</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Random Screen Saver</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Same Random Savers</col>
+      </row>
+    </data>
+  </object>
+  <object class="GtkListStore" id="visual_combo_model">
+    <columns>
+      <column type="gchararray"/>
+    </columns>
+    <data>
+      <row>
+        <col id="0" translatable="yes">Any</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Best</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Default</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Default-N</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">GL</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">TrueColor</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">PseudoColor</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">StaticGray</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">GrayScale</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">DirectColor</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Color</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Gray</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Mono</col>
+      </row>
+    </data>
+  </object>
+  <object class="GtkUIManager" id="uimanager1">
+    <child>
+      <object class="GtkActionGroup" id="actiongroup1">
+        <child>
+          <object class="GtkAction" id="file">
+            <property name="name">file</property>
+            <property name="label" translatable="yes">_File</property>
+            <signal handler="file_menu_cb" last_modification_time="Sun, 06 Mar 2005 21:41:13 GMT" name="activate"/>
+          </object>
+        </child>
+        <child>
+          <object class="GtkAction" id="activate_action">
+            <property name="name">activate_action</property>
+            <property name="label" translatable="yes">_Blank Screen Now</property>
+            <signal handler="activate_menu_cb" name="activate"/>
+          </object>
+        </child>
+        <child>
+          <object class="GtkAction" id="lock_action">
+            <property name="name">lock_action</property>
+            <property name="label" translatable="yes">_Lock Screen Now</property>
+            <signal handler="lock_menu_cb" name="activate"/>
+          </object>
+        </child>
+        <child>
+          <object class="GtkAction" id="kill_action">
+            <property name="name">kill_action</property>
+            <property name="label" translatable="yes">_Kill Daemon</property>
+            <signal handler="kill_menu_cb" name="activate"/>
+          </object>
+        </child>
+        <child>
+          <object class="GtkAction" id="restart_action">
+            <property name="name">restart_action</property>
+            <property name="label" translatable="yes">_Restart Daemon</property>
+            <signal handler="restart_menu_cb" name="activate"/>
+          </object>
+        </child>
+        <child>
+          <object class="GtkAction" id="exit_action">
+            <property name="name">exit_action</property>
+            <property name="label" translatable="yes">_Quit</property>
+            <signal handler="exit_menu_cb" name="activate"/>
+          </object>
+        </child>
+        <child>
+          <object class="GtkAction" id="help">
+            <property name="name">help</property>
+            <property name="label" translatable="yes">_Help</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkAction" id="about_action">
+            <property name="name">about_action</property>
+            <property name="label" translatable="yes">_About...</property>
+            <signal handler="about_menu_cb" name="activate"/>
+          </object>
+        </child>
+        <child>
+          <object class="GtkAction" id="doc_action">
+            <property name="name">doc_action</property>
+            <property name="label" translatable="yes">_Documentation...</property>
+            <signal handler="doc_menu_cb" name="activate"/>
+          </object>
+        </child>
+      </object>
+    </child>
+    <ui>
+      <menubar name="menubar">
+        <menu action="file">
+          <menuitem name="activate_menu" action="activate_action"/>
+          <menuitem name="lock_menu" action="lock_action"/>
+          <menuitem name="kill_menu" action="kill_action"/>
+          <menuitem name="restart_menu" action="restart_action"/>
+          <separator/>
+          <menuitem name="exit_menu" action="exit_action"/>
+        </menu>
+        <menu action="help">
+          <menuitem name="about_menu" action="about_action"/>
+          <menuitem name="doc_menu" action="doc_action"/>
+        </menu>
+      </menubar>
+    </ui>
+  </object>
+  <object class="GtkWindow" id="xscreensaver_demo">
+    <property name="title" translatable="yes">XScreenSaver</property>
+    <property name="type">GTK_WINDOW_TOPLEVEL</property>
+    <property name="window_position">GTK_WIN_POS_NONE</property>
+    <property name="modal">False</property>
+    <property name="resizable">True</property>
+    <property name="destroy_with_parent">False</property>
+    <property name="decorated">True</property>
+    <property name="skip_taskbar_hint">False</property>
+    <property name="skip_pager_hint">False</property>
+    <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
+    <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+    <property name="focus_on_map">True</property>
+    <property name="urgency_hint">False</property>
+    <child>
+      <object class="GtkVBox" id="outer_vbox">
+        <property name="visible">True</property>
+        <property name="homogeneous">False</property>
+        <property name="spacing">5</property>
+        <child>
+          <object class="GtkMenuBar" constructor="uimanager1" id="menubar">
+            <property name="visible">True</property>
+            <property name="pack_direction">GTK_PACK_DIRECTION_LTR</property>
+            <property name="child_pack_direction">GTK_PACK_DIRECTION_LTR</property>
+          </object>
+          <packing>
+            <property name="padding">0</property>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkHBox" id="spacer_hbox">
+            <property name="border_width">8</property>
+            <property name="visible">True</property>
+            <property name="homogeneous">False</property>
+            <property name="spacing">0</property>
+            <child>
+              <object class="GtkNotebook" id="notebook">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="show_tabs">True</property>
+                <property name="show_border">True</property>
+                <property name="tab_pos">GTK_POS_TOP</property>
+                <property name="scrollable">False</property>
+                <property name="enable_popup">False</property>
+                <signal handler="switch_page_cb" name="switch_page"/>
+                <child>
+                  <object class="GtkTable" id="demos_table">
+                    <property name="border_width">10</property>
+                    <property name="visible">True</property>
+                    <property name="n_rows">2</property>
+                    <property name="n_columns">2</property>
+                    <property name="homogeneous">False</property>
+                    <property name="row_spacing">0</property>
+                    <property name="column_spacing">0</property>
+                    <child>
+                      <object class="GtkTable" id="blanking_table">
+                        <property name="visible">True</property>
+                        <property name="n_rows">3</property>
+                        <property name="n_columns">4</property>
+                        <property name="homogeneous">False</property>
+                        <property name="row_spacing">2</property>
+                        <property name="column_spacing">0</property>
+                        <child>
+                          <object class="GtkLabel" id="cycle_label">
+                            <property name="visible">True</property>
+                            <property name="label" translatable="yes">_Cycle After</property>
+                            <property name="use_underline">True</property>
+                            <property name="use_markup">False</property>
+                            <property name="justify">GTK_JUSTIFY_RIGHT</property>
+                            <property name="wrap">False</property>
+                            <property name="selectable">False</property>
+                            <property name="xalign">1</property>
+                            <property name="yalign">0.5</property>
+                            <property name="xpad">8</property>
+                            <property name="ypad">0</property>
+                            <property name="mnemonic_widget">cycle_spinbutton</property>
+                            <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                            <property name="width_chars">-1</property>
+                            <property name="single_line_mode">False</property>
+                            <property name="angle">0</property>
+                            <accessibility>
+                              <relation target="cycle_spinbutton" type="label-for"/>
+                              <relation target="cycle_spinbutton" type="flows-to"/>
+                            </accessibility>
+                          </object>
+                          <packing>
+                            <property name="left_attach">1</property>
+                            <property name="right_attach">2</property>
+                            <property name="top_attach">1</property>
+                            <property name="bottom_attach">2</property>
+                            <property name="x_options">fill</property>
+                            <property name="y_options"/>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkEventBox" id="lock_button_eventbox">
+                            <property name="visible">True</property>
+                            <property name="tooltip-text" translatable="yes">Whether a password should be required to un-blank the screen.</property>
+                            <property name="visible_window">False</property>
+                            <property name="above_child">False</property>
+                            <child>
+                              <object class="GtkCheckButton" id="lock_button">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="label" translatable="yes">_Lock Screen After  </property>
+                                <property name="use_underline">True</property>
+                                <property name="relief">GTK_RELIEF_NORMAL</property>
+                                <property name="focus_on_click">True</property>
+                                <property name="active">False</property>
+                                <property name="inconsistent">False</property>
+                                <property name="draw_indicator">True</property>
+                                <accessibility>
+                                  <relation target="lock_spinbutton" type="controller-for"/>
+                                  <relation target="lock_spinbutton" type="label-for"/>
+                                  <relation target="lock_spinbutton" type="flows-to"/>
+                                </accessibility>
+                                <signal handler="pref_changed_cb" name="toggled"/>
+                                <child internal-child="accessible">
+                                  <object class="AtkObject" id="a11y-lock_button1">
+                                    <property name="AtkObject::accessible_name" translatable="yes">Lock Screen</property>
+                                  </object>
+                                </child>
+                              </object>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left_attach">0</property>
+                            <property name="right_attach">2</property>
+                            <property name="top_attach">2</property>
+                            <property name="bottom_attach">3</property>
+                            <property name="x_options">fill</property>
+                            <property name="y_options"/>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkSpinButton" id="timeout_spinbutton">
+                            <property name="visible">True</property>
+                            <property name="tooltip-text" translatable="yes">How long before the screen saver activates.</property>
+                            <property name="can_focus">True</property>
+                            <property name="climb_rate">15</property>
+                            <property name="digits">0</property>
+                            <property name="numeric">True</property>
+                            <property name="update_policy">GTK_UPDATE_ALWAYS</property>
+                            <property name="snap_to_ticks">True</property>
+                            <property name="wrap">False</property>
+                            <property name="adjustment">adjustment1</property>
+                            <accessibility>
+                              <relation target="timeout_label" type="labelled-by"/>
+                              <relation target="timeout_mlabel" type="labelled-by"/>
+                              <relation target="timeout_label" type="flows-from"/>
+                              <relation target="timeout_mlabel" type="flows-to"/>
+                            </accessibility>
+                            <signal handler="pref_changed_cb" name="activate"/>
+                            <signal handler="pref_changed_event_cb" name="focus_out_event"/>
+                            <signal handler="pref_changed_cb" name="value_changed"/>
+                          </object>
+                          <packing>
+                            <property name="left_attach">2</property>
+                            <property name="right_attach">3</property>
+                            <property name="top_attach">0</property>
+                            <property name="bottom_attach">1</property>
+                            <property name="x_options">fill</property>
+                            <property name="y_options"/>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkSpinButton" id="lock_spinbutton">
+                            <property name="visible">True</property>
+                            <property name="tooltip-text" translatable="yes">How long after the screen blanks until a password will be required.</property>
+                            <property name="can_focus">True</property>
+                            <property name="climb_rate">15</property>
+                            <property name="digits">0</property>
+                            <property name="numeric">True</property>
+                            <property name="update_policy">GTK_UPDATE_ALWAYS</property>
+                            <property name="snap_to_ticks">True</property>
+                            <property name="wrap">False</property>
+                            <property name="adjustment">adjustment2</property>
+                            <accessibility>
+                              <relation target="lock_button" type="controlled-by"/>
+                              <relation target="lock_button" type="labelled-by"/>
+                              <relation target="lock_mlabel" type="labelled-by"/>
+                              <relation target="lock_button" type="flows-from"/>
+                              <relation target="lock_mlabel" type="flows-to"/>
+                            </accessibility>
+                            <signal handler="pref_changed_cb" name="activate"/>
+                            <signal handler="pref_changed_event_cb" name="focus_out_event"/>
+                            <signal handler="pref_changed_cb" name="value_changed"/>
+                            <child internal-child="accessible">
+                              <object class="AtkObject" id="a11y-lock_spinbutton1">
+                                <property name="AtkObject::accessible_name" translatable="yes">Lock Screen After</property>
+                              </object>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left_attach">2</property>
+                            <property name="right_attach">3</property>
+                            <property name="top_attach">2</property>
+                            <property name="bottom_attach">3</property>
+                            <property name="y_padding">10</property>
+                            <property name="x_options">fill</property>
+                            <property name="y_options"/>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkSpinButton" id="cycle_spinbutton">
+                            <property name="visible">True</property>
+                            <property name="tooltip-text" translatable="yes">How long each display mode should run before choosing a new one (in Random mode.)</property>
+                            <property name="can_focus">True</property>
+                            <property name="climb_rate">15</property>
+                            <property name="digits">0</property>
+                            <property name="numeric">True</property>
+                            <property name="update_policy">GTK_UPDATE_ALWAYS</property>
+                            <property name="snap_to_ticks">True</property>
+                            <property name="wrap">False</property>
+                            <property name="adjustment">adjustment3</property>
+                            <accessibility>
+                              <relation target="cycle_label" type="labelled-by"/>
+                              <relation target="cycle_mlabel" type="labelled-by"/>
+                              <relation target="cycle_label" type="flows-from"/>
+                              <relation target="cycle_mlabel" type="flows-to"/>
+                            </accessibility>
+                            <signal handler="pref_changed_cb" name="activate"/>
+                            <signal handler="pref_changed_event_cb" name="focus_out_event"/>
+                            <signal handler="pref_changed_cb" name="value_changed"/>
+                          </object>
+                          <packing>
+                            <property name="left_attach">2</property>
+                            <property name="right_attach">3</property>
+                            <property name="top_attach">1</property>
+                            <property name="bottom_attach">2</property>
+                            <property name="x_options">fill</property>
+                            <property name="y_options"/>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkLabel" id="lock_mlabel">
+                            <property name="visible">True</property>
+                            <property name="label" translatable="yes">minutes</property>
+                            <property name="use_underline">False</property>
+                            <property name="use_markup">False</property>
+                            <property name="justify">GTK_JUSTIFY_LEFT</property>
+                            <property name="wrap">False</property>
+                            <property name="selectable">False</property>
+                            <property name="xalign">0</property>
+                            <property name="yalign">0.5</property>
+                            <property name="xpad">8</property>
+                            <property name="ypad">0</property>
+                            <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                            <property name="width_chars">-1</property>
+                            <property name="single_line_mode">False</property>
+                            <property name="angle">0</property>
+                            <accessibility>
+                              <relation target="lock_spinbutton" type="label-for"/>
+                              <relation target="lock_spinbutton" type="flows-to"/>
+                            </accessibility>
+                          </object>
+                          <packing>
+                            <property name="left_attach">3</property>
+                            <property name="right_attach">4</property>
+                            <property name="top_attach">2</property>
+                            <property name="bottom_attach">3</property>
+                            <property name="y_options"/>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkLabel" id="cycle_mlabel">
+                            <property name="visible">True</property>
+                            <property name="label" translatable="yes">minutes</property>
+                            <property name="use_underline">False</property>
+                            <property name="use_markup">False</property>
+                            <property name="justify">GTK_JUSTIFY_LEFT</property>
+                            <property name="wrap">False</property>
+                            <property name="selectable">False</property>
+                            <property name="xalign">0</property>
+                            <property name="yalign">0.5</property>
+                            <property name="xpad">8</property>
+                            <property name="ypad">0</property>
+                            <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                            <property name="width_chars">-1</property>
+                            <property name="single_line_mode">False</property>
+                            <property name="angle">0</property>
+                            <accessibility>
+                              <relation target="cycle_spinbutton" type="label-for"/>
+                              <relation target="cycle_spinbutton" type="flows-from"/>
+                            </accessibility>
+                          </object>
+                          <packing>
+                            <property name="left_attach">3</property>
+                            <property name="right_attach">4</property>
+                            <property name="top_attach">1</property>
+                            <property name="bottom_attach">2</property>
+                            <property name="y_options"/>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkLabel" id="timeout_label">
+                            <property name="visible">True</property>
+                            <property name="label" translatable="yes">_Blank After</property>
+                            <property name="use_underline">True</property>
+                            <property name="use_markup">False</property>
+                            <property name="justify">GTK_JUSTIFY_RIGHT</property>
+                            <property name="wrap">False</property>
+                            <property name="selectable">False</property>
+                            <property name="xalign">1</property>
+                            <property name="yalign">0.5</property>
+                            <property name="xpad">8</property>
+                            <property name="ypad">0</property>
+                            <property name="mnemonic_widget">timeout_spinbutton</property>
+                            <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                            <property name="width_chars">-1</property>
+                            <property name="single_line_mode">False</property>
+                            <property name="angle">0</property>
+                            <accessibility>
+                              <relation target="timeout_spinbutton" type="label-for"/>
+                              <relation target="timeout_spinbutton" type="flows-to"/>
+                            </accessibility>
+                          </object>
+                          <packing>
+                            <property name="left_attach">1</property>
+                            <property name="right_attach">2</property>
+                            <property name="top_attach">0</property>
+                            <property name="bottom_attach">1</property>
+                            <property name="x_options">fill</property>
+                            <property name="y_options"/>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkLabel" id="timeout_mlabel">
+                            <property name="visible">True</property>
+                            <property name="label" translatable="yes">minutes</property>
+                            <property name="use_underline">False</property>
+                            <property name="use_markup">False</property>
+                            <property name="justify">GTK_JUSTIFY_LEFT</property>
+                            <property name="wrap">False</property>
+                            <property name="selectable">False</property>
+                            <property name="xalign">0</property>
+                            <property name="yalign">0.5</property>
+                            <property name="xpad">8</property>
+                            <property name="ypad">0</property>
+                            <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                            <property name="width_chars">-1</property>
+                            <property name="single_line_mode">False</property>
+                            <property name="angle">0</property>
+                            <accessibility>
+                              <relation target="timeout_spinbutton" type="label-for"/>
+                              <relation target="timeout_spinbutton" type="flows-from"/>
+                            </accessibility>
+                          </object>
+                          <packing>
+                            <property name="left_attach">3</property>
+                            <property name="right_attach">4</property>
+                            <property name="top_attach">0</property>
+                            <property name="bottom_attach">1</property>
+                            <property name="y_options"/>
+                          </packing>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="right_attach">1</property>
+                        <property name="top_attach">1</property>
+                        <property name="bottom_attach">2</property>
+                        <property name="x_options">fill</property>
+                        <property name="y_options">fill</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkHButtonBox" id="demo_manual_hbbox">
+                        <property name="visible">True</property>
+                        <property name="layout_style">GTK_BUTTONBOX_SPREAD</property>
+                        <property name="spacing">30</property>
+                        <child>
+                          <object class="GtkButton" id="demo">
+                            <property name="visible">True</property>
+                            <property name="tooltip-text" translatable="yes">Demo the selected screen saver in full-screen mode (click the mouse to return.)</property>
+                            <property name="can_default">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="label" translatable="yes">_Preview</property>
+                            <property name="use_underline">True</property>
+                            <property name="relief">GTK_RELIEF_NORMAL</property>
+                            <property name="focus_on_click">True</property>
+                            <signal handler="run_this_cb" name="clicked"/>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkButton" id="settings">
+                            <property name="visible">True</property>
+                            <property name="tooltip-text" translatable="yes">Customization and explanation of the selected screen saver.</property>
+                            <property name="can_default">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="label" translatable="yes">_Settings...</property>
+                            <property name="use_underline">True</property>
+                            <property name="relief">GTK_RELIEF_NORMAL</property>
+                            <property name="focus_on_click">True</property>
+                            <signal handler="settings_cb" name="clicked"/>
+                          </object>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="left_attach">1</property>
+                        <property name="right_attach">2</property>
+                        <property name="top_attach">1</property>
+                        <property name="bottom_attach">2</property>
+                        <property name="x_options">fill</property>
+                        <property name="y_options">fill</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkVBox" id="list_vbox">
+                        <property name="border_width">10</property>
+                        <property name="visible">True</property>
+                        <property name="homogeneous">False</property>
+                        <property name="spacing">0</property>
+                        <child>
+                          <object class="GtkHBox" id="mode_hbox">
+                            <property name="visible">True</property>
+                            <property name="homogeneous">False</property>
+                            <property name="spacing">0</property>
+                            <child>
+                              <object class="GtkLabel" id="mode_label">
+                                <property name="visible">True</property>
+                                <property name="label" translatable="yes">_Mode:</property>
+                                <property name="use_underline">True</property>
+                                <property name="use_markup">False</property>
+                                <property name="justify">GTK_JUSTIFY_LEFT</property>
+                                <property name="wrap">False</property>
+                                <property name="selectable">False</property>
+                                <property name="xalign">0</property>
+                                <property name="yalign">0.5</property>
+                                <property name="xpad">0</property>
+                                <property name="ypad">0</property>
+                                <property name="mnemonic_widget">mode_menu</property>
+                                <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                                <property name="width_chars">-1</property>
+                                <property name="single_line_mode">False</property>
+                                <property name="angle">0</property>
+                                <accessibility>
+                                  <relation target="mode_menu" type="label-for"/>
+                                </accessibility>
+                              </object>
+                              <packing>
+                                <property name="padding">0</property>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkComboBox" id="mode_menu">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="has_entry">False</property>
+                                <property name="model">mode_menu_model</property>
+                                <accessibility>
+                                  <relation target="mode_label" type="labelled-by"/>
+                                </accessibility>
+                                <child>
+                                  <object class="GtkCellRendererText" id="renderer1"/>
+                                  <attributes>
+                                    <attribute name="text">0</attribute>
+                                  </attributes>
+                                </child>
+                              </object>
+                              <packing>
+                                <property name="padding">4</property>
+                                <property name="expand">True</property>
+                                <property name="fill">True</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="padding">10</property>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkScrolledWindow" id="scroller">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
+                            <property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
+                            <property name="shadow_type">GTK_SHADOW_IN</property>
+                            <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
+                            <child>
+                              <object class="GtkTreeView" id="list">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="headers_visible">False</property>
+                                <property name="rules_hint">True</property>
+                                <property name="reorderable">False</property>
+                                <property name="enable_search">True</property>
+                                <property name="fixed_height_mode">False</property>
+                                <property name="hover_selection">False</property>
+                                <property name="hover_expand">False</property>
+                              </object>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="padding">0</property>
+                            <property name="expand">True</property>
+                            <property name="fill">True</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkHBox" id="centering_hbox">
+                            <property name="visible">True</property>
+                            <property name="homogeneous">True</property>
+                            <property name="spacing">0</property>
+                            <child>
+                              <object class="GtkHBox" id="next_prev_hbox">
+                                <property name="visible">True</property>
+                                <property name="homogeneous">False</property>
+                                <property name="spacing">0</property>
+                                <child>
+                                  <object class="GtkButton" id="next">
+                                    <property name="visible">True</property>
+                                    <property name="tooltip-text" translatable="yes">Run the next screen saver in the list in full-screen mode (click the mouse to return.)</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="relief">GTK_RELIEF_NORMAL</property>
+                                    <property name="focus_on_click">True</property>
+                                    <signal handler="run_next_cb" name="clicked"/>
+                                    <child>
+                                      <object class="GtkArrow" id="arrow1">
+                                        <property name="visible">True</property>
+                                        <property name="arrow_type">GTK_ARROW_DOWN</property>
+                                        <property name="shadow_type">GTK_SHADOW_OUT</property>
+                                        <property name="xalign">0.5</property>
+                                        <property name="yalign">0.5</property>
+                                        <property name="xpad">0</property>
+                                        <property name="ypad">0</property>
+                                      </object>
+                                    </child>
+                                  </object>
+                                  <packing>
+                                    <property name="padding">0</property>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkButton" id="prev">
+                                    <property name="visible">True</property>
+                                    <property name="tooltip-text" translatable="yes">Run the previous screen saver in the list in full-screen mode (click the mouse to return.)</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="relief">GTK_RELIEF_NORMAL</property>
+                                    <property name="focus_on_click">True</property>
+                                    <signal handler="run_prev_cb" name="clicked"/>
+                                    <child>
+                                      <object class="GtkArrow" id="arrow2">
+                                        <property name="visible">True</property>
+                                        <property name="arrow_type">GTK_ARROW_UP</property>
+                                        <property name="shadow_type">GTK_SHADOW_OUT</property>
+                                        <property name="xalign">0.5</property>
+                                        <property name="yalign">0.5</property>
+                                        <property name="xpad">0</property>
+                                        <property name="ypad">0</property>
+                                      </object>
+                                    </child>
+                                  </object>
+                                  <packing>
+                                    <property name="padding">0</property>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                  </packing>
+                                </child>
+                              </object>
+                              <packing>
+                                <property name="padding">0</property>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="padding">0</property>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="pack_type">GTK_PACK_END</property>
+                          </packing>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="right_attach">1</property>
+                        <property name="top_attach">0</property>
+                        <property name="bottom_attach">1</property>
+                        <property name="x_options">fill</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkFrame" id="preview_frame">
+                        <property name="visible">True</property>
+                        <property name="label_xalign">0</property>
+                        <property name="label_yalign">0.5</property>
+                        <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
+                        <accessibility>
+                          <relation target="label1" type="labelled-by"/>
+                        </accessibility>
+                        <child>
+                          <object class="GtkNotebook" id="preview_notebook">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="show_tabs">True</property>
+                            <property name="show_border">False</property>
+                            <property name="tab_pos">GTK_POS_BOTTOM</property>
+                            <property name="scrollable">False</property>
+                            <property name="enable_popup">False</property>
+                            <child>
+                              <object class="GtkAspectFrame" id="preview_aspectframe">
+                                <property name="border_width">8</property>
+                                <property name="visible">True</property>
+                                <property name="label_xalign">0</property>
+                                <property name="label_yalign">0.5</property>
+                                <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
+                                <property name="xalign">0.5</property>
+                                <property name="yalign">0.5</property>
+                                <property name="ratio">1.33000004292</property>
+                                <property name="obey_child">False</property>
+                                <child>
+                                  <object class="GtkDrawingArea" id="preview">
+                                    <property name="visible">True</property>
+                                  </object>
+                                </child>
+                              </object>
+                              <packing>
+                                <property name="tab_expand">False</property>
+                                <property name="tab_fill">True</property>
+                              </packing>
+                            </child>
+                            <child type="tab">
+                              <object class="GtkLabel" id="preview_tab">
+                                <property name="visible">True</property>
+                                <property name="label" translatable="yes">preview</property>
+                                <property name="use_underline">False</property>
+                                <property name="use_markup">False</property>
+                                <property name="justify">GTK_JUSTIFY_LEFT</property>
+                                <property name="wrap">False</property>
+                                <property name="selectable">False</property>
+                                <property name="xalign">0.5</property>
+                                <property name="yalign">0.5</property>
+                                <property name="xpad">0</property>
+                                <property name="ypad">0</property>
+                                <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                                <property name="width_chars">-1</property>
+                                <property name="single_line_mode">False</property>
+                                <property name="angle">0</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkLabel" id="no_preview_label">
+                                <property name="visible">True</property>
+                                <property name="label" translatable="yes">No Preview
+Available</property>
+                                <property name="use_underline">False</property>
+                                <property name="use_markup">False</property>
+                                <property name="justify">GTK_JUSTIFY_CENTER</property>
+                                <property name="wrap">False</property>
+                                <property name="selectable">False</property>
+                                <property name="xalign">0.5</property>
+                                <property name="yalign">0.5</property>
+                                <property name="xpad">0</property>
+                                <property name="ypad">0</property>
+                                <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                                <property name="width_chars">-1</property>
+                                <property name="single_line_mode">False</property>
+                                <property name="angle">0</property>
+                              </object>
+                              <packing>
+                                <property name="tab_expand">False</property>
+                                <property name="tab_fill">True</property>
+                              </packing>
+                            </child>
+                            <child type="tab">
+                              <object class="GtkLabel" id="no_preview_tab">
+                                <property name="visible">True</property>
+                                <property name="label" translatable="yes">no preview</property>
+                                <property name="use_underline">False</property>
+                                <property name="use_markup">False</property>
+                                <property name="justify">GTK_JUSTIFY_LEFT</property>
+                                <property name="wrap">False</property>
+                                <property name="selectable">False</property>
+                                <property name="xalign">0.5</property>
+                                <property name="yalign">0.5</property>
+                                <property name="xpad">0</property>
+                                <property name="ypad">0</property>
+                                <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                                <property name="width_chars">-1</property>
+                                <property name="single_line_mode">False</property>
+                                <property name="angle">0</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkLabel" id="not_installed_label">
+                                <property name="visible">True</property>
+                                <property name="label" translatable="yes">Not
+Installed</property>
+                                <property name="use_underline">False</property>
+                                <property name="use_markup">False</property>
+                                <property name="justify">GTK_JUSTIFY_CENTER</property>
+                                <property name="wrap">False</property>
+                                <property name="selectable">False</property>
+                                <property name="xalign">0.5</property>
+                                <property name="yalign">0.5</property>
+                                <property name="xpad">0</property>
+                                <property name="ypad">0</property>
+                                <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                                <property name="width_chars">-1</property>
+                                <property name="single_line_mode">False</property>
+                                <property name="angle">0</property>
+                              </object>
+                              <packing>
+                                <property name="tab_expand">False</property>
+                                <property name="tab_fill">True</property>
+                              </packing>
+                            </child>
+                            <child type="tab">
+                              <object class="GtkLabel" id="not_installed_tab">
+                                <property name="visible">True</property>
+                                <property name="label" translatable="yes">not installed</property>
+                                <property name="use_underline">False</property>
+                                <property name="use_markup">False</property>
+                                <property name="justify">GTK_JUSTIFY_LEFT</property>
+                                <property name="wrap">False</property>
+                                <property name="selectable">False</property>
+                                <property name="xalign">0.5</property>
+                                <property name="yalign">0.5</property>
+                                <property name="xpad">0</property>
+                                <property name="ypad">0</property>
+                                <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                                <property name="width_chars">-1</property>
+                                <property name="single_line_mode">False</property>
+                                <property name="angle">0</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkLabel" id="nothing_label">
+                                <property name="visible">True</property>
+                                <property name="label" translatable="yes">Very few (or no) screen savers appear to be available.
+
+This probably means that the "xscreensaver-extras" and
+"xscreensaver-gl-extras" packages are not installed.</property>
+                                <property name="use_underline">False</property>
+                                <property name="use_markup">False</property>
+                                <property name="justify">GTK_JUSTIFY_CENTER</property>
+                                <property name="wrap">False</property>
+                                <property name="selectable">False</property>
+                                <property name="xalign">0.5</property>
+                                <property name="yalign">0.5</property>
+                                <property name="xpad">0</property>
+                                <property name="ypad">0</property>
+                                <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                                <property name="width_chars">-1</property>
+                                <property name="single_line_mode">False</property>
+                                <property name="angle">0</property>
+                              </object>
+                              <packing>
+                                <property name="tab_expand">False</property>
+                                <property name="tab_fill">True</property>
+                              </packing>
+                            </child>
+                            <child type="tab">
+                              <object class="GtkLabel" id="nothing_tab">
+                                <property name="visible">True</property>
+                                <property name="label" translatable="yes">nothing</property>
+                                <property name="use_underline">False</property>
+                                <property name="use_markup">False</property>
+                                <property name="justify">GTK_JUSTIFY_LEFT</property>
+                                <property name="wrap">False</property>
+                                <property name="selectable">False</property>
+                                <property name="xalign">0.5</property>
+                                <property name="yalign">0.5</property>
+                                <property name="xpad">0</property>
+                                <property name="ypad">0</property>
+                                <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                                <property name="width_chars">-1</property>
+                                <property name="single_line_mode">False</property>
+                                <property name="angle">0</property>
+                              </object>
+                            </child>
+                          </object>
+                        </child>
+                        <child type="label">
+                          <object class="GtkLabel" id="label1">
+                            <property name="visible">True</property>
+                            <property name="label" translatable="yes">Description</property>
+                            <property name="use_underline">False</property>
+                            <property name="use_markup">False</property>
+                            <property name="justify">GTK_JUSTIFY_LEFT</property>
+                            <property name="wrap">False</property>
+                            <property name="selectable">False</property>
+                            <property name="xalign">0.5</property>
+                            <property name="yalign">0.5</property>
+                            <property name="xpad">0</property>
+                            <property name="ypad">0</property>
+                            <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                            <property name="width_chars">-1</property>
+                            <property name="single_line_mode">False</property>
+                            <property name="angle">0</property>
+                            <accessibility>
+                              <relation target="preview_frame" type="label-for"/>
+                            </accessibility>
+                          </object>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="left_attach">1</property>
+                        <property name="right_attach">2</property>
+                        <property name="top_attach">0</property>
+                        <property name="bottom_attach">1</property>
+                        <property name="y_padding">6</property>
+                        <property name="x_options">expand|shrink|fill</property>
+                        <property name="y_options">expand|shrink|fill</property>
+                      </packing>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="tab_expand">False</property>
+                    <property name="tab_fill">True</property>
+                  </packing>
+                </child>
+                <child type="tab">
+                  <object class="GtkLabel" id="demo_tab">
+                    <property name="visible">True</property>
+                    <property name="label" translatable="yes">_Display Modes</property>
+                    <property name="use_underline">True</property>
+                    <property name="use_markup">False</property>
+                    <property name="justify">GTK_JUSTIFY_CENTER</property>
+                    <property name="wrap">False</property>
+                    <property name="selectable">False</property>
+                    <property name="xalign">0.5</property>
+                    <property name="yalign">0.5</property>
+                    <property name="xpad">0</property>
+                    <property name="ypad">0</property>
+                    <property name="mnemonic_widget">notebook</property>
+                    <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                    <property name="width_chars">-1</property>
+                    <property name="single_line_mode">False</property>
+                    <property name="angle">0</property>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkTable" id="options_table">
+                    <property name="visible">True</property>
+                    <property name="n_rows">2</property>
+                    <property name="n_columns">2</property>
+                    <property name="homogeneous">True</property>
+                    <property name="row_spacing">0</property>
+                    <property name="column_spacing">0</property>
+                    <child>
+                      <object class="GtkFrame" id="grab_frame">
+                        <property name="border_width">10</property>
+                        <property name="visible">True</property>
+                        <property name="label_xalign">0</property>
+                        <property name="label_yalign">0.5</property>
+                        <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
+                        <accessibility>
+                          <relation target="label2" type="labelled-by"/>
+                        </accessibility>
+                        <child>
+                          <object class="GtkHBox" id="grab_hbox">
+                            <property name="border_width">8</property>
+                            <property name="visible">True</property>
+                            <property name="homogeneous">False</property>
+                            <property name="spacing">8</property>
+                            <child>
+                              <object class="GtkImage" id="image2">
+                                <property name="visible">True</property>
+                                <property name="pixbuf">screensaver-snap.png</property>
+                                <property name="xalign">0</property>
+                                <property name="yalign">0</property>
+                                <property name="xpad">4</property>
+                                <property name="ypad">8</property>
+                              </object>
+                              <packing>
+                                <property name="padding">0</property>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkVBox" id="grab_vbox">
+                                <property name="visible">True</property>
+                                <property name="homogeneous">False</property>
+                                <property name="spacing">0</property>
+                                <child>
+                                  <object class="GtkCheckButton" id="grab_desk_button">
+                                    <property name="visible">True</property>
+                                    <property name="tooltip-text" translatable="yes">Whether the image-manipulating modes should be allowed to operate on an image of your desktop.</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="label" translatable="yes">Grab Desktop _Images</property>
+                                    <property name="use_underline">True</property>
+                                    <property name="relief">GTK_RELIEF_NORMAL</property>
+                                    <property name="focus_on_click">True</property>
+                                    <property name="active">False</property>
+                                    <property name="inconsistent">False</property>
+                                    <property name="draw_indicator">True</property>
+                                    <signal handler="pref_changed_cb" name="toggled"/>
+                                  </object>
+                                  <packing>
+                                    <property name="padding">0</property>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkCheckButton" id="grab_video_button">
+                                    <property name="visible">True</property>
+                                    <property name="tooltip-text" translatable="yes">Whether the image-manipulating modes should operate on images captured from the system's video input (if there is one.)</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="label" translatable="yes">Grab _Video Frames</property>
+                                    <property name="use_underline">True</property>
+                                    <property name="relief">GTK_RELIEF_NORMAL</property>
+                                    <property name="focus_on_click">True</property>
+                                    <property name="active">False</property>
+                                    <property name="inconsistent">False</property>
+                                    <property name="draw_indicator">True</property>
+                                    <signal handler="pref_changed_cb" name="toggled"/>
+                                  </object>
+                                  <packing>
+                                    <property name="padding">0</property>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkCheckButton" id="grab_image_button">
+                                    <property name="visible">True</property>
+                                    <property name="tooltip-text" translatable="yes">Whether the image-manipulating modes should load image files.</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="label" translatable="yes">Choose _Random Image:</property>
+                                    <property name="use_underline">True</property>
+                                    <property name="relief">GTK_RELIEF_NORMAL</property>
+                                    <property name="focus_on_click">True</property>
+                                    <property name="active">False</property>
+                                    <property name="inconsistent">False</property>
+                                    <property name="draw_indicator">True</property>
+                                    <accessibility>
+                                      <relation target="image_text" type="controller-for"/>
+                                      <relation target="image_browse_button" type="controller-for"/>
+                                    </accessibility>
+                                    <signal handler="pref_changed_cb" name="toggled"/>
+                                  </object>
+                                  <packing>
+                                    <property name="padding">0</property>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkHBox" id="image_hbox">
+                                    <property name="visible">True</property>
+                                    <property name="homogeneous">False</property>
+                                    <property name="spacing">0</property>
+                                    <child>
+                                      <object class="GtkLabel" id="grab_dummy">
+                                        <property name="visible">True</property>
+                                        <property name="label" translatable="yes"/>
+                                        <property name="use_underline">False</property>
+                                        <property name="use_markup">False</property>
+                                        <property name="justify">GTK_JUSTIFY_LEFT</property>
+                                        <property name="wrap">False</property>
+                                        <property name="selectable">False</property>
+                                        <property name="xalign">0.5</property>
+                                        <property name="yalign">0.5</property>
+                                        <property name="xpad">8</property>
+                                        <property name="ypad">0</property>
+                                        <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                                        <property name="width_chars">-1</property>
+                                        <property name="single_line_mode">False</property>
+                                        <property name="angle">0</property>
+                                      </object>
+                                      <packing>
+                                        <property name="padding">0</property>
+                                        <property name="expand">False</property>
+                                        <property name="fill">False</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkEntry" id="image_text">
+                                        <property name="visible">True</property>
+                                        <property name="tooltip-text" translatable="yes">The local directory, RSS feed or Atom feed from which images will be randomly chosen.</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="editable">True</property>
+                                        <property name="visibility">True</property>
+                                        <property name="max_length">0</property>
+                                        <property name="text" translatable="yes"/>
+                                        <property name="has_frame">True</property>
+                                        <property name="invisible_char">*</property>
+                                        <property name="activates_default">False</property>
+                                        <accessibility>
+                                          <relation target="grab_image_button" type="labelled-by"/>
+                                          <relation target="grab_image_button" type="controlled-by"/>
+                                        </accessibility>
+                                        <signal handler="pref_changed_cb" name="activate"/>
+                                        <signal handler="pref_changed_event_cb" name="focus_out_event"/>
+                                      </object>
+                                      <packing>
+                                        <property name="padding">2</property>
+                                        <property name="expand">True</property>
+                                        <property name="fill">True</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkButton" id="image_browse_button">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="label" translatable="yes">_Browse</property>
+                                        <property name="use_underline">True</property>
+                                        <property name="relief">GTK_RELIEF_NORMAL</property>
+                                        <property name="focus_on_click">True</property>
+                                        <signal handler="browse_image_dir_cb" name="clicked"/>
+                                      </object>
+                                      <packing>
+                                        <property name="padding">0</property>
+                                        <property name="expand">False</property>
+                                        <property name="fill">False</property>
+                                      </packing>
+                                    </child>
+                                  </object>
+                                  <packing>
+                                    <property name="padding">0</property>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkLabel" id="label8">
+                                    <property name="visible">True</property>
+                                    <property name="label" translatable="yes">Local directory, or RSS feed URL.</property>
+                                    <property name="use_underline">False</property>
+                                    <property name="use_markup">False</property>
+                                    <property name="justify">GTK_JUSTIFY_LEFT</property>
+                                    <property name="wrap">False</property>
+                                    <property name="selectable">False</property>
+                                    <property name="xalign">0</property>
+                                    <property name="yalign">0.5</property>
+                                    <property name="xpad">20</property>
+                                    <property name="ypad">0</property>
+                                    <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                                    <property name="width_chars">-1</property>
+                                    <property name="single_line_mode">False</property>
+                                    <property name="angle">0</property>
+                                  </object>
+                                  <packing>
+                                    <property name="padding">0</property>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                  </packing>
+                                </child>
+                              </object>
+                              <packing>
+                                <property name="padding">0</property>
+                                <property name="expand">True</property>
+                                <property name="fill">True</property>
+                              </packing>
+                            </child>
+                          </object>
+                        </child>
+                        <child type="label">
+                          <object class="GtkLabel" id="label2">
+                            <property name="visible">True</property>
+                            <property name="label" translatable="yes">Image Manipulation</property>
+                            <property name="use_underline">False</property>
+                            <property name="use_markup">False</property>
+                            <property name="justify">GTK_JUSTIFY_LEFT</property>
+                            <property name="wrap">False</property>
+                            <property name="selectable">False</property>
+                            <property name="xalign">0.5</property>
+                            <property name="yalign">0.5</property>
+                            <property name="xpad">0</property>
+                            <property name="ypad">0</property>
+                            <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                            <property name="width_chars">-1</property>
+                            <property name="single_line_mode">False</property>
+                            <property name="angle">0</property>
+                            <accessibility>
+                              <relation target="grab_frame" type="label-for"/>
+                            </accessibility>
+                          </object>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="right_attach">1</property>
+                        <property name="top_attach">0</property>
+                        <property name="bottom_attach">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkFrame" id="diag_frame">
+                        <property name="border_width">10</property>
+                        <property name="visible">True</property>
+                        <property name="label_xalign">0</property>
+                        <property name="label_yalign">0.5</property>
+                        <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
+                        <accessibility>
+                          <relation target="label3" type="labelled-by"/>
+                        </accessibility>
+                        <child>
+                          <object class="GtkHBox" id="diag_hbox">
+                            <property name="border_width">8</property>
+                            <property name="visible">True</property>
+                            <property name="homogeneous">False</property>
+                            <property name="spacing">8</property>
+                            <child>
+                              <object class="GtkImage" id="diag_logo">
+                                <property name="visible">True</property>
+                                <property name="pixbuf">screensaver-diagnostic.png</property>
+                                <property name="xalign">0.5</property>
+                                <property name="yalign">0</property>
+                                <property name="xpad">0</property>
+                                <property name="ypad">0</property>
+                              </object>
+                              <packing>
+                                <property name="padding">0</property>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkTable" id="text_table">
+                                <property name="visible">True</property>
+                                <property name="n_rows">5</property>
+                                <property name="n_columns">3</property>
+                                <property name="homogeneous">False</property>
+                                <property name="row_spacing">2</property>
+                                <property name="column_spacing">2</property>
+                                <child>
+                                  <object class="GtkRadioButton" id="text_radio">
+                                    <property name="visible">True</property>
+                                    <property name="tooltip-text" translatable="yes">Text-displaying modes will display the text typed here.</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="label" translatable="yes">_Text</property>
+                                    <property name="use_underline">True</property>
+                                    <property name="relief">GTK_RELIEF_NORMAL</property>
+                                    <property name="focus_on_click">True</property>
+                                    <property name="active">False</property>
+                                    <property name="inconsistent">False</property>
+                                    <property name="draw_indicator">True</property>
+                                    <accessibility>
+                                      <relation target="text_entry" type="controller-for"/>
+                                      <relation target="text_entry" type="label-for"/>
+                                    </accessibility>
+                                    <signal handler="pref_changed_cb" last_modification_time="Sun, 20 Mar 2005 21:31:44 GMT" name="toggled"/>
+                                  </object>
+                                  <packing>
+                                    <property name="left_attach">0</property>
+                                    <property name="right_attach">1</property>
+                                    <property name="top_attach">1</property>
+                                    <property name="bottom_attach">2</property>
+                                    <property name="x_options">fill</property>
+                                    <property name="y_options"/>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkRadioButton" id="text_file_radio">
+                                    <property name="visible">True</property>
+                                    <property name="tooltip-text" translatable="yes">Text-displaying modes will display the contents of this file.</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="label" translatable="yes">Text _file</property>
+                                    <property name="use_underline">True</property>
+                                    <property name="relief">GTK_RELIEF_NORMAL</property>
+                                    <property name="focus_on_click">True</property>
+                                    <property name="active">False</property>
+                                    <property name="inconsistent">False</property>
+                                    <property name="draw_indicator">True</property>
+                                    <property name="group">text_radio</property>
+                                    <accessibility>
+                                      <relation target="text_file_entry" type="label-for"/>
+                                      <relation target="text_file_entry" type="controller-for"/>
+                                    </accessibility>
+                                    <signal handler="pref_changed_cb" last_modification_time="Sun, 20 Mar 2005 21:31:55 GMT" name="toggled"/>
+                                  </object>
+                                  <packing>
+                                    <property name="left_attach">0</property>
+                                    <property name="right_attach">1</property>
+                                    <property name="top_attach">2</property>
+                                    <property name="bottom_attach">3</property>
+                                    <property name="x_options">fill</property>
+                                    <property name="y_options"/>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkRadioButton" id="text_program_radio">
+                                    <property name="visible">True</property>
+                                    <property name="tooltip-text" translatable="yes">Text-displaying modes will display the output of this program.</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="label" translatable="yes">_Program</property>
+                                    <property name="use_underline">True</property>
+                                    <property name="relief">GTK_RELIEF_NORMAL</property>
+                                    <property name="focus_on_click">True</property>
+                                    <property name="active">False</property>
+                                    <property name="inconsistent">False</property>
+                                    <property name="draw_indicator">True</property>
+                                    <property name="group">text_radio</property>
+                                    <accessibility>
+                                      <relation target="text_program_entry" type="label-for"/>
+                                      <relation target="text_program_entry" type="controller-for"/>
+                                      <relation target="text_program_browse" type="controller-for"/>
+                                    </accessibility>
+                                    <signal handler="pref_changed_cb" last_modification_time="Sun, 20 Mar 2005 21:32:07 GMT" name="toggled"/>
+                                  </object>
+                                  <packing>
+                                    <property name="left_attach">0</property>
+                                    <property name="right_attach">1</property>
+                                    <property name="top_attach">3</property>
+                                    <property name="bottom_attach">4</property>
+                                    <property name="x_options">fill</property>
+                                    <property name="y_options"/>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkRadioButton" id="text_url_radio">
+                                    <property name="visible">True</property>
+                                    <property name="tooltip-text" translatable="yes">Text-displaying modes will display the contents of this URL (HTML or RSS).</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="label" translatable="yes">_URL</property>
+                                    <property name="use_underline">True</property>
+                                    <property name="relief">GTK_RELIEF_NORMAL</property>
+                                    <property name="focus_on_click">True</property>
+                                    <property name="active">False</property>
+                                    <property name="inconsistent">False</property>
+                                    <property name="draw_indicator">True</property>
+                                    <property name="group">text_radio</property>
+                                    <accessibility>
+                                      <relation target="text_url_entry" type="label-for"/>
+                                      <relation target="text_url_entry" type="controller-for"/>
+                                    </accessibility>
+                                    <signal handler="pref_changed_cb" last_modification_time="Sun, 20 Mar 2005 21:32:17 GMT" name="toggled"/>
+                                  </object>
+                                  <packing>
+                                    <property name="left_attach">0</property>
+                                    <property name="right_attach">1</property>
+                                    <property name="top_attach">4</property>
+                                    <property name="bottom_attach">5</property>
+                                    <property name="x_options">fill</property>
+                                    <property name="y_options"/>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkRadioButton" id="text_host_radio">
+                                    <property name="visible">True</property>
+                                    <property name="tooltip-text" translatable="yes">Text-displaying modes will display the local host name, date, and time.</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="label" translatable="yes">_Host Name and Time</property>
+                                    <property name="use_underline">True</property>
+                                    <property name="relief">GTK_RELIEF_NORMAL</property>
+                                    <property name="focus_on_click">True</property>
+                                    <property name="active">True</property>
+                                    <property name="inconsistent">False</property>
+                                    <property name="draw_indicator">True</property>
+                                    <property name="group">text_radio</property>
+                                    <signal handler="pref_changed_cb" last_modification_time="Sun, 20 Mar 2005 21:31:32 GMT" name="toggled"/>
+                                  </object>
+                                  <packing>
+                                    <property name="left_attach">0</property>
+                                    <property name="right_attach">3</property>
+                                    <property name="top_attach">0</property>
+                                    <property name="bottom_attach">1</property>
+                                    <property name="x_options">fill</property>
+                                    <property name="y_options"/>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkEntry" id="text_url_entry">
+                                    <property name="visible">True</property>
+                                    <property name="tooltip-text" translatable="yes">Text-displaying modes will display the contents of this URL (HTML or RSS).</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="editable">True</property>
+                                    <property name="visibility">True</property>
+                                    <property name="max_length">0</property>
+                                    <property name="text" translatable="yes"/>
+                                    <property name="has_frame">True</property>
+                                    <property name="invisible_char">*</property>
+                                    <property name="activates_default">False</property>
+                                    <accessibility>
+                                      <relation target="text_url_radio" type="controlled-by"/>
+                                    </accessibility>
+                                    <signal handler="pref_changed_cb" last_modification_time="Sun, 20 Mar 2005 21:33:10 GMT" name="activate"/>
+                                    <signal handler="pref_changed_event_cb" last_modification_time="Sun, 20 Mar 2005 21:34:26 GMT" name="focus_out_event"/>
+                                  </object>
+                                  <packing>
+                                    <property name="left_attach">1</property>
+                                    <property name="right_attach">3</property>
+                                    <property name="top_attach">4</property>
+                                    <property name="bottom_attach">5</property>
+                                    <property name="y_options"/>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkButton" id="text_file_browse">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="label" translatable="yes">_Browse</property>
+                                    <property name="use_underline">True</property>
+                                    <property name="relief">GTK_RELIEF_NORMAL</property>
+                                    <property name="focus_on_click">True</property>
+                                    <accessibility>
+                                      <relation target="text_file_radio" type="controlled-by"/>
+                                    </accessibility>
+                                    <signal handler="browse_text_file_cb" last_modification_time="Sun, 20 Mar 2005 01:24:38 GMT" name="clicked"/>
+                                  </object>
+                                  <packing>
+                                    <property name="left_attach">2</property>
+                                    <property name="right_attach">3</property>
+                                    <property name="top_attach">2</property>
+                                    <property name="bottom_attach">3</property>
+                                    <property name="x_options">fill</property>
+                                    <property name="y_options"/>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkEntry" id="text_entry">
+                                    <property name="visible">True</property>
+                                    <property name="tooltip-text" translatable="yes">Text-displaying modes will display the text typed here.</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="editable">True</property>
+                                    <property name="visibility">True</property>
+                                    <property name="max_length">0</property>
+                                    <property name="text" translatable="yes"/>
+                                    <property name="has_frame">True</property>
+                                    <property name="invisible_char">*</property>
+                                    <property name="activates_default">False</property>
+                                    <accessibility>
+                                      <relation target="text_program_radio" type="labelled-by"/>
+                                      <relation target="text_program_radio" type="controlled-by"/>
+                                    </accessibility>
+                                    <signal handler="pref_changed_cb" last_modification_time="Sun, 20 Mar 2005 21:32:42 GMT" name="activate"/>
+                                    <signal handler="pref_changed_event_cb" last_modification_time="Sun, 20 Mar 2005 21:33:43 GMT" name="focus_out_event"/>
+                                  </object>
+                                  <packing>
+                                    <property name="left_attach">1</property>
+                                    <property name="right_attach">3</property>
+                                    <property name="top_attach">1</property>
+                                    <property name="bottom_attach">2</property>
+                                    <property name="y_options"/>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkEntry" id="text_program_entry">
+                                    <property name="visible">True</property>
+                                    <property name="tooltip-text" translatable="yes">Text-displaying modes will display the output of this program.</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="editable">True</property>
+                                    <property name="visibility">True</property>
+                                    <property name="max_length">0</property>
+                                    <property name="text" translatable="yes"/>
+                                    <property name="has_frame">True</property>
+                                    <property name="invisible_char">*</property>
+                                    <property name="activates_default">False</property>
+                                    <accessibility>
+                                      <relation target="text_program_radio" type="labelled-by"/>
+                                      <relation target="text_program_radio" type="controlled-by"/>
+                                    </accessibility>
+                                    <signal handler="pref_changed_cb" last_modification_time="Sun, 20 Mar 2005 21:33:02 GMT" name="activate"/>
+                                    <signal handler="pref_changed_event_cb" last_modification_time="Sun, 20 Mar 2005 21:34:15 GMT" name="focus_out_event"/>
+                                  </object>
+                                  <packing>
+                                    <property name="left_attach">1</property>
+                                    <property name="right_attach">2</property>
+                                    <property name="top_attach">3</property>
+                                    <property name="bottom_attach">4</property>
+                                    <property name="y_options"/>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkButton" id="text_program_browse">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="label" translatable="yes">_Browse</property>
+                                    <property name="use_underline">True</property>
+                                    <property name="relief">GTK_RELIEF_NORMAL</property>
+                                    <property name="focus_on_click">True</property>
+                                    <accessibility>
+                                      <relation target="text_program_radio" type="controller-for"/>
+                                    </accessibility>
+                                    <signal handler="browse_text_program_cb" last_modification_time="Sun, 20 Mar 2005 01:24:51 GMT" name="clicked"/>
+                                  </object>
+                                  <packing>
+                                    <property name="left_attach">2</property>
+                                    <property name="right_attach">3</property>
+                                    <property name="top_attach">3</property>
+                                    <property name="bottom_attach">4</property>
+                                    <property name="x_options">fill</property>
+                                    <property name="y_options"/>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkEntry" id="text_file_entry">
+                                    <property name="visible">True</property>
+                                    <property name="tooltip-text" translatable="yes">Text-displaying modes will display the contents of this file.</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="editable">True</property>
+                                    <property name="visibility">True</property>
+                                    <property name="max_length">0</property>
+                                    <property name="text" translatable="yes"/>
+                                    <property name="has_frame">True</property>
+                                    <property name="invisible_char">*</property>
+                                    <property name="activates_default">False</property>
+                                    <accessibility>
+                                      <relation target="text_file_radio" type="labelled-by"/>
+                                      <relation target="text_file_radio" type="controlled-by"/>
+                                    </accessibility>
+                                    <signal handler="pref_changed_cb" last_modification_time="Sun, 20 Mar 2005 21:32:53 GMT" name="activate"/>
+                                    <signal handler="pref_changed_event_cb" last_modification_time="Sun, 20 Mar 2005 21:33:55 GMT" name="focus_out_event"/>
+                                  </object>
+                                  <packing>
+                                    <property name="left_attach">1</property>
+                                    <property name="right_attach">2</property>
+                                    <property name="top_attach">2</property>
+                                    <property name="bottom_attach">3</property>
+                                    <property name="y_options"/>
+                                  </packing>
+                                </child>
+                              </object>
+                              <packing>
+                                <property name="padding">0</property>
+                                <property name="expand">True</property>
+                                <property name="fill">True</property>
+                              </packing>
+                            </child>
+                          </object>
+                        </child>
+                        <child type="label">
+                          <object class="GtkLabel" id="label3">
+                            <property name="visible">True</property>
+                            <property name="label" translatable="yes">Text Manipulation</property>
+                            <property name="use_underline">False</property>
+                            <property name="use_markup">False</property>
+                            <property name="justify">GTK_JUSTIFY_LEFT</property>
+                            <property name="wrap">False</property>
+                            <property name="selectable">False</property>
+                            <property name="xalign">0.5</property>
+                            <property name="yalign">0.5</property>
+                            <property name="xpad">0</property>
+                            <property name="ypad">0</property>
+                            <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                            <property name="width_chars">-1</property>
+                            <property name="single_line_mode">False</property>
+                            <property name="angle">0</property>
+                            <accessibility>
+                              <relation target="diag_frame" type="label-for"/>
+                            </accessibility>
+                          </object>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="right_attach">1</property>
+                        <property name="top_attach">1</property>
+                        <property name="bottom_attach">2</property>
+                        <property name="x_options">fill</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkFrame" id="dpms_frame">
+                        <property name="border_width">10</property>
+                        <property name="visible">True</property>
+                        <property name="label_xalign">0</property>
+                        <property name="label_yalign">0.5</property>
+                        <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
+                        <child>
+                          <object class="GtkHBox" id="dpms_hbox">
+                            <property name="border_width">8</property>
+                            <property name="visible">True</property>
+                            <property name="homogeneous">False</property>
+                            <property name="spacing">8</property>
+                            <child>
+                              <object class="GtkImage" id="dpms_logo">
+                                <property name="visible">True</property>
+                                <property name="pixbuf">screensaver-power.png</property>
+                                <property name="xalign">0.5</property>
+                                <property name="yalign">0</property>
+                                <property name="xpad">0</property>
+                                <property name="ypad">0</property>
+                              </object>
+                              <packing>
+                                <property name="padding">0</property>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkVBox" id="vbox6">
+                                <property name="visible">True</property>
+                                <property name="homogeneous">False</property>
+                                <property name="spacing">0</property>
+                                <child>
+                                  <object class="GtkCheckButton" id="dpms_button">
+                                    <property name="visible">True</property>
+                                    <property name="tooltip-text" translatable="yes">Whether the monitor should be powered down after a while.</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="label" translatable="yes">_Power Management Enabled</property>
+                                    <property name="use_underline">True</property>
+                                    <property name="relief">GTK_RELIEF_NORMAL</property>
+                                    <property name="focus_on_click">True</property>
+                                    <property name="active">True</property>
+                                    <property name="inconsistent">False</property>
+                                    <property name="draw_indicator">True</property>
+                                    <accessibility>
+                                      <relation target="dpms_suspend_spinbutton" type="controller-for"/>
+                                      <relation target="dpms_standby_spinbutton" type="controller-for"/>
+                                      <relation target="dpms_off_spinbutton" type="controller-for"/>
+                                    </accessibility>
+                                    <signal handler="pref_changed_cb" name="toggled"/>
+                                  </object>
+                                  <packing>
+                                    <property name="padding">0</property>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkTable" id="dpms_table">
+                                    <property name="visible">True</property>
+                                    <property name="n_rows">3</property>
+                                    <property name="n_columns">3</property>
+                                    <property name="homogeneous">False</property>
+                                    <property name="row_spacing">2</property>
+                                    <property name="column_spacing">4</property>
+                                    <child>
+                                      <object class="GtkLabel" id="dpms_standby_label">
+                                        <property name="visible">True</property>
+                                        <property name="label" translatable="yes">Stand_by After</property>
+                                        <property name="use_underline">True</property>
+                                        <property name="use_markup">False</property>
+                                        <property name="justify">GTK_JUSTIFY_LEFT</property>
+                                        <property name="wrap">False</property>
+                                        <property name="selectable">False</property>
+                                        <property name="xalign">1</property>
+                                        <property name="yalign">0.5</property>
+                                        <property name="xpad">10</property>
+                                        <property name="ypad">0</property>
+                                        <property name="mnemonic_widget">dpms_standby_spinbutton</property>
+                                        <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                                        <property name="width_chars">-1</property>
+                                        <property name="single_line_mode">False</property>
+                                        <property name="angle">0</property>
+                                        <accessibility>
+                                          <relation target="dpms_standby_spinbutton" type="label-for"/>
+                                          <relation target="dpms_standby_spinbutton" type="flows-to"/>
+                                        </accessibility>
+                                      </object>
+                                      <packing>
+                                        <property name="left_attach">0</property>
+                                        <property name="right_attach">1</property>
+                                        <property name="top_attach">0</property>
+                                        <property name="bottom_attach">1</property>
+                                        <property name="x_options">fill</property>
+                                        <property name="y_options"/>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkLabel" id="dpms_suspend_label">
+                                        <property name="visible">True</property>
+                                        <property name="label" translatable="yes">Sus_pend After</property>
+                                        <property name="use_underline">True</property>
+                                        <property name="use_markup">False</property>
+                                        <property name="justify">GTK_JUSTIFY_LEFT</property>
+                                        <property name="wrap">False</property>
+                                        <property name="selectable">False</property>
+                                        <property name="xalign">1</property>
+                                        <property name="yalign">0.5</property>
+                                        <property name="xpad">10</property>
+                                        <property name="ypad">0</property>
+                                        <property name="mnemonic_widget">dpms_suspend_spinbutton</property>
+                                        <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                                        <property name="width_chars">-1</property>
+                                        <property name="single_line_mode">False</property>
+                                        <property name="angle">0</property>
+                                        <accessibility>
+                                          <relation target="dpms_suspend_spinbutton" type="label-for"/>
+                                          <relation target="dpms_suspend_spinbutton" type="flows-to"/>
+                                        </accessibility>
+                                      </object>
+                                      <packing>
+                                        <property name="left_attach">0</property>
+                                        <property name="right_attach">1</property>
+                                        <property name="top_attach">1</property>
+                                        <property name="bottom_attach">2</property>
+                                        <property name="x_options">fill</property>
+                                        <property name="y_options"/>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkLabel" id="dpms_off_label">
+                                        <property name="visible">True</property>
+                                        <property name="label" translatable="yes">_Off After</property>
+                                        <property name="use_underline">True</property>
+                                        <property name="use_markup">False</property>
+                                        <property name="justify">GTK_JUSTIFY_LEFT</property>
+                                        <property name="wrap">False</property>
+                                        <property name="selectable">False</property>
+                                        <property name="xalign">1</property>
+                                        <property name="yalign">0.5</property>
+                                        <property name="xpad">10</property>
+                                        <property name="ypad">0</property>
+                                        <property name="mnemonic_widget">dpms_off_spinbutton</property>
+                                        <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                                        <property name="width_chars">-1</property>
+                                        <property name="single_line_mode">False</property>
+                                        <property name="angle">0</property>
+                                        <accessibility>
+                                          <relation target="dpms_off_spinbutton" type="label-for"/>
+                                          <relation target="dpms_off_spinbutton" type="flows-to"/>
+                                        </accessibility>
+                                      </object>
+                                      <packing>
+                                        <property name="left_attach">0</property>
+                                        <property name="right_attach">1</property>
+                                        <property name="top_attach">2</property>
+                                        <property name="bottom_attach">3</property>
+                                        <property name="x_options">fill</property>
+                                        <property name="y_options"/>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkLabel" id="dpms_standby_mlabel">
+                                        <property name="visible">True</property>
+                                        <property name="label" translatable="yes">minutes</property>
+                                        <property name="use_underline">False</property>
+                                        <property name="use_markup">False</property>
+                                        <property name="justify">GTK_JUSTIFY_LEFT</property>
+                                        <property name="wrap">False</property>
+                                        <property name="selectable">False</property>
+                                        <property name="xalign">0</property>
+                                        <property name="yalign">0.5</property>
+                                        <property name="xpad">0</property>
+                                        <property name="ypad">0</property>
+                                        <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                                        <property name="width_chars">-1</property>
+                                        <property name="single_line_mode">False</property>
+                                        <property name="angle">0</property>
+                                        <accessibility>
+                                          <relation target="dpms_standby_spinbutton" type="label-for"/>
+                                          <relation target="dpms_standby_spinbutton" type="flows-from"/>
+                                        </accessibility>
+                                      </object>
+                                      <packing>
+                                        <property name="left_attach">2</property>
+                                        <property name="right_attach">3</property>
+                                        <property name="top_attach">0</property>
+                                        <property name="bottom_attach">1</property>
+                                        <property name="x_options">fill</property>
+                                        <property name="y_options"/>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkLabel" id="dpms_suspend_mlabel">
+                                        <property name="visible">True</property>
+                                        <property name="label" translatable="yes">minutes</property>
+                                        <property name="use_underline">False</property>
+                                        <property name="use_markup">False</property>
+                                        <property name="justify">GTK_JUSTIFY_LEFT</property>
+                                        <property name="wrap">False</property>
+                                        <property name="selectable">False</property>
+                                        <property name="xalign">0</property>
+                                        <property name="yalign">0.5</property>
+                                        <property name="xpad">0</property>
+                                        <property name="ypad">0</property>
+                                        <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                                        <property name="width_chars">-1</property>
+                                        <property name="single_line_mode">False</property>
+                                        <property name="angle">0</property>
+                                        <accessibility>
+                                          <relation target="dpms_suspend_spinbutton" type="label-for"/>
+                                          <relation target="dpms_suspend_spinbutton" type="flows-from"/>
+                                        </accessibility>
+                                      </object>
+                                      <packing>
+                                        <property name="left_attach">2</property>
+                                        <property name="right_attach">3</property>
+                                        <property name="top_attach">1</property>
+                                        <property name="bottom_attach">2</property>
+                                        <property name="x_options">fill</property>
+                                        <property name="y_options"/>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkLabel" id="dpms_off_mlabel">
+                                        <property name="visible">True</property>
+                                        <property name="label" translatable="yes">minutes</property>
+                                        <property name="use_underline">False</property>
+                                        <property name="use_markup">False</property>
+                                        <property name="justify">GTK_JUSTIFY_LEFT</property>
+                                        <property name="wrap">False</property>
+                                        <property name="selectable">False</property>
+                                        <property name="xalign">0</property>
+                                        <property name="yalign">0.5</property>
+                                        <property name="xpad">0</property>
+                                        <property name="ypad">0</property>
+                                        <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                                        <property name="width_chars">-1</property>
+                                        <property name="single_line_mode">False</property>
+                                        <property name="angle">0</property>
+                                        <accessibility>
+                                          <relation target="dpms_off_spinbutton" type="label-for"/>
+                                          <relation target="dpms_off_spinbutton" type="flows-from"/>
+                                        </accessibility>
+                                      </object>
+                                      <packing>
+                                        <property name="left_attach">2</property>
+                                        <property name="right_attach">3</property>
+                                        <property name="top_attach">2</property>
+                                        <property name="bottom_attach">3</property>
+                                        <property name="x_options">fill</property>
+                                        <property name="y_options"/>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkSpinButton" id="dpms_off_spinbutton">
+                                        <property name="visible">True</property>
+                                        <property name="tooltip-text" translatable="yes">How long until the monitor powers down.</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="climb_rate">15</property>
+                                        <property name="digits">0</property>
+                                        <property name="numeric">True</property>
+                                        <property name="update_policy">GTK_UPDATE_ALWAYS</property>
+                                        <property name="snap_to_ticks">True</property>
+                                        <property name="wrap">False</property>
+                                        <property name="adjustment">adjustment4</property>
+                                        <accessibility>
+                                          <relation target="dpms_button" type="controlled-by"/>
+                                          <relation target="dpms_off_label" type="labelled-by"/>
+                                          <relation target="dpms_off_mlabel" type="labelled-by"/>
+                                          <relation target="dpms_off_label" type="flows-from"/>
+                                          <relation target="dpms_off_mlabel" type="flows-to"/>
+                                        </accessibility>
+                                        <signal handler="pref_changed_cb" name="activate"/>
+                                        <signal handler="pref_changed_event_cb" name="focus_out_event"/>
+                                        <signal handler="pref_changed_cb" name="value_changed"/>
+                                      </object>
+                                      <packing>
+                                        <property name="left_attach">1</property>
+                                        <property name="right_attach">2</property>
+                                        <property name="top_attach">2</property>
+                                        <property name="bottom_attach">3</property>
+                                        <property name="x_options"/>
+                                        <property name="y_options"/>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkSpinButton" id="dpms_suspend_spinbutton">
+                                        <property name="visible">True</property>
+                                        <property name="tooltip-text" translatable="yes">How long until the monitor goes into power-saving mode.</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="climb_rate">15</property>
+                                        <property name="digits">0</property>
+                                        <property name="numeric">True</property>
+                                        <property name="update_policy">GTK_UPDATE_ALWAYS</property>
+                                        <property name="snap_to_ticks">True</property>
+                                        <property name="wrap">False</property>
+                                        <property name="adjustment">adjustment5</property>
+                                        <accessibility>
+                                          <relation target="dpms_button" type="controlled-by"/>
+                                          <relation target="dpms_suspend_label" type="labelled-by"/>
+                                          <relation target="dpms_suspend_mlabel" type="labelled-by"/>
+                                          <relation target="dpms_suspend_label" type="flows-from"/>
+                                          <relation target="dpms_suspend_mlabel" type="flows-to"/>
+                                        </accessibility>
+                                        <signal handler="pref_changed_cb" name="activate"/>
+                                        <signal handler="pref_changed_event_cb" name="focus_out_event"/>
+                                        <signal handler="pref_changed_cb" name="value_changed"/>
+                                      </object>
+                                      <packing>
+                                        <property name="left_attach">1</property>
+                                        <property name="right_attach">2</property>
+                                        <property name="top_attach">1</property>
+                                        <property name="bottom_attach">2</property>
+                                        <property name="x_options"/>
+                                        <property name="y_options"/>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkSpinButton" id="dpms_standby_spinbutton">
+                                        <property name="visible">True</property>
+                                        <property name="tooltip-text" translatable="yes">How long until the monitor goes completely black.</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="climb_rate">15</property>
+                                        <property name="digits">0</property>
+                                        <property name="numeric">True</property>
+                                        <property name="update_policy">GTK_UPDATE_ALWAYS</property>
+                                        <property name="snap_to_ticks">True</property>
+                                        <property name="wrap">False</property>
+                                        <property name="adjustment">adjustment6</property>
+                                        <accessibility>
+                                          <relation target="dpms_button" type="controlled-by"/>
+                                          <relation target="dpms_standby_label" type="labelled-by"/>
+                                          <relation target="dpms_standby_mlabel" type="labelled-by"/>
+                                          <relation target="dpms_standby_label" type="flows-from"/>
+                                          <relation target="dpms_standby_mlabel" type="flows-to"/>
+                                        </accessibility>
+                                        <signal handler="pref_changed_cb" name="activate"/>
+                                        <signal handler="pref_changed_event_cb" name="focus_out_event"/>
+                                        <signal handler="pref_changed_cb" name="value_changed"/>
+                                      </object>
+                                      <packing>
+                                        <property name="left_attach">1</property>
+                                        <property name="right_attach">2</property>
+                                        <property name="top_attach">0</property>
+                                        <property name="bottom_attach">1</property>
+                                        <property name="x_options"/>
+                                        <property name="y_options"/>
+                                      </packing>
+                                    </child>
+                                  </object>
+                                  <packing>
+                                    <property name="padding">0</property>
+                                    <property name="expand">False</property>
+                                    <property name="fill">True</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkCheckButton" id="dpms_quickoff_button">
+                                    <property name="visible">True</property>
+                                    <property name="tooltip-text" translatable="yes">Whether the monitor should be powered off immediately in "Blank Screen Only" mode, regardless of the above power-management timeouts.</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="label" translatable="yes">_Quick Power-off in Blank Only Mode</property>
+                                    <property name="use_underline">True</property>
+                                    <property name="relief">GTK_RELIEF_NORMAL</property>
+                                    <property name="focus_on_click">True</property>
+                                    <property name="active">False</property>
+                                    <property name="inconsistent">False</property>
+                                    <property name="draw_indicator">True</property>
+                                    <signal handler="pref_changed_cb" name="toggled"/>
+                                  </object>
+                                  <packing>
+                                    <property name="padding">0</property>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                  </packing>
+                                </child>
+                              </object>
+                              <packing>
+                                <property name="padding">0</property>
+                                <property name="expand">True</property>
+                                <property name="fill">True</property>
+                              </packing>
+                            </child>
+                          </object>
+                        </child>
+                        <child type="label">
+                          <object class="GtkLabel" id="label4">
+                            <property name="visible">True</property>
+                            <property name="label" translatable="yes">Display Power Management</property>
+                            <property name="use_underline">False</property>
+                            <property name="use_markup">False</property>
+                            <property name="justify">GTK_JUSTIFY_LEFT</property>
+                            <property name="wrap">False</property>
+                            <property name="selectable">False</property>
+                            <property name="xalign">0.5</property>
+                            <property name="yalign">0.5</property>
+                            <property name="xpad">0</property>
+                            <property name="ypad">0</property>
+                            <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                            <property name="width_chars">-1</property>
+                            <property name="single_line_mode">False</property>
+                            <property name="angle">0</property>
+                            <accessibility>
+                              <relation target="dpms_frame" type="label-for"/>
+                            </accessibility>
+                          </object>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="left_attach">1</property>
+                        <property name="right_attach">2</property>
+                        <property name="top_attach">0</property>
+                        <property name="bottom_attach">1</property>
+                        <property name="y_options">fill</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkFrame" id="cmap_frame">
+                        <property name="border_width">10</property>
+                        <property name="visible">True</property>
+                        <property name="label_xalign">0</property>
+                        <property name="label_yalign">0.5</property>
+                        <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
+                        <accessibility>
+                          <relation target="label5" type="labelled-by"/>
+                        </accessibility>
+                        <child>
+                          <object class="GtkHBox" id="cmap_hbox">
+                            <property name="border_width">8</property>
+                            <property name="visible">True</property>
+                            <property name="homogeneous">False</property>
+                            <property name="spacing">8</property>
+                            <child>
+                              <object class="GtkImage" id="image5">
+                                <property name="visible">True</property>
+                                <property name="pixbuf">screensaver-colorselector.png</property>
+                                <property name="xalign">0.5</property>
+                                <property name="yalign">0</property>
+                                <property name="xpad">0</property>
+                                <property name="ypad">0</property>
+                              </object>
+                              <packing>
+                                <property name="padding">0</property>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkVBox" id="vbox7">
+                                <property name="visible">True</property>
+                                <property name="homogeneous">False</property>
+                                <property name="spacing">0</property>
+                                <child>
+                                  <object class="GtkCheckButton" id="fade_button">
+                                    <property name="visible">True</property>
+                                    <property name="tooltip-text" translatable="yes">Whether the screen should slowly fade to black when the screen saver activates.</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="label" translatable="yes">Fade to Black when _Blanking</property>
+                                    <property name="use_underline">True</property>
+                                    <property name="relief">GTK_RELIEF_NORMAL</property>
+                                    <property name="focus_on_click">True</property>
+                                    <property name="active">False</property>
+                                    <property name="inconsistent">False</property>
+                                    <property name="draw_indicator">True</property>
+                                    <accessibility>
+                                      <relation target="fade_spinbutton" type="controller-for"/>
+                                    </accessibility>
+                                    <signal handler="pref_changed_cb" name="toggled"/>
+                                  </object>
+                                  <packing>
+                                    <property name="padding">0</property>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkCheckButton" id="unfade_button">
+                                    <property name="visible">True</property>
+                                    <property name="tooltip-text" translatable="yes">Whether the screen should slowly fade in from black when the screen saver deactivates.</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="label" translatable="yes">Fade from Black When _Unblanking</property>
+                                    <property name="use_underline">True</property>
+                                    <property name="relief">GTK_RELIEF_NORMAL</property>
+                                    <property name="focus_on_click">True</property>
+                                    <property name="active">False</property>
+                                    <property name="inconsistent">False</property>
+                                    <property name="draw_indicator">True</property>
+                                    <accessibility>
+                                      <relation target="fade_spinbutton" type="controller-for"/>
+                                    </accessibility>
+                                    <signal handler="pref_changed_cb" name="toggled"/>
+                                  </object>
+                                  <packing>
+                                    <property name="padding">0</property>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkHBox" id="fade_hbox">
+                                    <property name="visible">True</property>
+                                    <property name="homogeneous">False</property>
+                                    <property name="spacing">0</property>
+                                    <child>
+                                      <object class="GtkLabel" id="fade_dummy">
+                                        <property name="visible">True</property>
+                                        <property name="label" translatable="yes"/>
+                                        <property name="use_underline">False</property>
+                                        <property name="use_markup">False</property>
+                                        <property name="justify">GTK_JUSTIFY_LEFT</property>
+                                        <property name="wrap">False</property>
+                                        <property name="selectable">False</property>
+                                        <property name="xalign">0.5</property>
+                                        <property name="yalign">0.5</property>
+                                        <property name="xpad">3</property>
+                                        <property name="ypad">0</property>
+                                        <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                                        <property name="width_chars">-1</property>
+                                        <property name="single_line_mode">False</property>
+                                        <property name="angle">0</property>
+                                      </object>
+                                      <packing>
+                                        <property name="padding">0</property>
+                                        <property name="expand">False</property>
+                                        <property name="fill">False</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkLabel" id="fade_label">
+                                        <property name="visible">True</property>
+                                        <property name="label" translatable="yes">F_ade Duration</property>
+                                        <property name="use_underline">True</property>
+                                        <property name="use_markup">False</property>
+                                        <property name="justify">GTK_JUSTIFY_LEFT</property>
+                                        <property name="wrap">False</property>
+                                        <property name="selectable">False</property>
+                                        <property name="xalign">0</property>
+                                        <property name="yalign">0.5</property>
+                                        <property name="xpad">0</property>
+                                        <property name="ypad">0</property>
+                                        <property name="mnemonic_widget">fade_spinbutton</property>
+                                        <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                                        <property name="width_chars">-1</property>
+                                        <property name="single_line_mode">False</property>
+                                        <property name="angle">0</property>
+                                        <accessibility>
+                                          <relation target="fade_spinbutton" type="label-for"/>
+                                          <relation target="fade_spinbutton" type="flows-to"/>
+                                        </accessibility>
+                                      </object>
+                                      <packing>
+                                        <property name="padding">14</property>
+                                        <property name="expand">False</property>
+                                        <property name="fill">False</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkSpinButton" id="fade_spinbutton">
+                                        <property name="visible">True</property>
+                                        <property name="tooltip-text" translatable="yes">How long it should take for the screen to fade in and out.</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="climb_rate">1</property>
+                                        <property name="digits">0</property>
+                                        <property name="numeric">True</property>
+                                        <property name="update_policy">GTK_UPDATE_ALWAYS</property>
+                                        <property name="snap_to_ticks">True</property>
+                                        <property name="wrap">False</property>
+                                        <property name="adjustment">adjustment7</property>
+                                        <accessibility>
+                                          <relation target="unfade_button" type="controlled-by"/>
+                                          <relation target="fade_button" type="controlled-by"/>
+                                          <relation target="fade_label" type="labelled-by"/>
+                                          <relation target="fade_sec_label" type="labelled-by"/>
+                                          <relation target="fade_label" type="flows-from"/>
+                                          <relation target="fade_sec_label" type="flows-to"/>
+                                        </accessibility>
+                                        <signal handler="pref_changed_cb" name="activate"/>
+                                        <signal handler="pref_changed_event_cb" name="focus_out_event"/>
+                                        <signal handler="pref_changed_cb" name="value_changed"/>
+                                      </object>
+                                      <packing>
+                                        <property name="padding">4</property>
+                                        <property name="expand">False</property>
+                                        <property name="fill">False</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkLabel" id="fade_sec_label">
+                                        <property name="visible">True</property>
+                                        <property name="label" translatable="yes">seconds</property>
+                                        <property name="use_underline">False</property>
+                                        <property name="use_markup">False</property>
+                                        <property name="justify">GTK_JUSTIFY_LEFT</property>
+                                        <property name="wrap">False</property>
+                                        <property name="selectable">False</property>
+                                        <property name="xalign">0</property>
+                                        <property name="yalign">0.5</property>
+                                        <property name="xpad">0</property>
+                                        <property name="ypad">0</property>
+                                        <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                                        <property name="width_chars">-1</property>
+                                        <property name="single_line_mode">False</property>
+                                        <property name="angle">0</property>
+                                        <accessibility>
+                                          <relation target="fade_spinbutton" type="label-for"/>
+                                          <relation target="fade_spinbutton" type="flows-from"/>
+                                        </accessibility>
+                                      </object>
+                                      <packing>
+                                        <property name="padding">2</property>
+                                        <property name="expand">False</property>
+                                        <property name="fill">False</property>
+                                      </packing>
+                                    </child>
+                                  </object>
+                                  <packing>
+                                    <property name="padding">0</property>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkHSeparator" id="cmap_hr">
+                                    <property name="visible">True</property>
+                                  </object>
+                                  <packing>
+                                    <property name="padding">8</property>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkCheckButton" id="install_button">
+                                    <property name="visible">True</property>
+                                    <property name="tooltip-text" translatable="yes">Whether to install a private colormap when running in 8-bit mode on the default Visual.</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="label" translatable="yes">Install _Colormap</property>
+                                    <property name="use_underline">True</property>
+                                    <property name="relief">GTK_RELIEF_NORMAL</property>
+                                    <property name="focus_on_click">True</property>
+                                    <property name="active">False</property>
+                                    <property name="inconsistent">False</property>
+                                    <property name="draw_indicator">True</property>
+                                    <signal handler="pref_changed_cb" name="toggled"/>
+                                  </object>
+                                  <packing>
+                                    <property name="padding">0</property>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                  </packing>
+                                </child>
+                              </object>
+                              <packing>
+                                <property name="padding">0</property>
+                                <property name="expand">True</property>
+                                <property name="fill">True</property>
+                              </packing>
+                            </child>
+                          </object>
+                        </child>
+                        <child type="label">
+                          <object class="GtkLabel" id="label5">
+                            <property name="visible">True</property>
+                            <property name="label" translatable="yes">Fading and Colormaps</property>
+                            <property name="use_underline">False</property>
+                            <property name="use_markup">False</property>
+                            <property name="justify">GTK_JUSTIFY_LEFT</property>
+                            <property name="wrap">False</property>
+                            <property name="selectable">False</property>
+                            <property name="xalign">0.5</property>
+                            <property name="yalign">0.5</property>
+                            <property name="xpad">0</property>
+                            <property name="ypad">0</property>
+                            <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                            <property name="width_chars">-1</property>
+                            <property name="single_line_mode">False</property>
+                            <property name="angle">0</property>
+                            <accessibility>
+                              <relation target="cmap_frame" type="label-for"/>
+                            </accessibility>
+                          </object>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="left_attach">1</property>
+                        <property name="right_attach">2</property>
+                        <property name="top_attach">1</property>
+                        <property name="bottom_attach">2</property>
+                        <property name="x_options">fill</property>
+                        <property name="y_options">fill</property>
+                      </packing>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="tab_expand">False</property>
+                    <property name="tab_fill">True</property>
+                  </packing>
+                </child>
+                <child type="tab">
+                  <object class="GtkLabel" id="options_tab">
+                    <property name="visible">True</property>
+                    <property name="label" translatable="yes">_Advanced</property>
+                    <property name="use_underline">True</property>
+                    <property name="use_markup">False</property>
+                    <property name="justify">GTK_JUSTIFY_LEFT</property>
+                    <property name="wrap">False</property>
+                    <property name="selectable">False</property>
+                    <property name="xalign">0.5</property>
+                    <property name="yalign">0.5</property>
+                    <property name="xpad">0</property>
+                    <property name="ypad">0</property>
+                    <property name="mnemonic_widget">notebook</property>
+                    <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                    <property name="width_chars">-1</property>
+                    <property name="single_line_mode">False</property>
+                    <property name="angle">0</property>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="padding">0</property>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="padding">0</property>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkHButtonBox" id="hbuttonbox2">
+            <property name="border_width">5</property>
+            <property name="layout_style">GTK_BUTTONBOX_EDGE</property>
+            <property name="spacing">10</property>
+            <child>
+              <object class="GtkButton" id="helpbutton">
+                <property name="visible">True</property>
+                <property name="can_default">True</property>
+                <property name="can_focus">True</property>
+                <property name="label">gtk-help</property>
+                <property name="use_stock">True</property>
+                <property name="relief">GTK_RELIEF_NORMAL</property>
+                <property name="focus_on_click">True</property>
+                <signal handler="doc_menu_cb" name="clicked"/>
+              </object>
+            </child>
+            <child>
+              <object class="GtkButton" id="closebutton">
+                <property name="visible">True</property>
+                <property name="can_default">True</property>
+                <property name="can_focus">True</property>
+                <property name="label">gtk-close</property>
+                <property name="use_stock">True</property>
+                <property name="relief">GTK_RELIEF_NORMAL</property>
+                <property name="focus_on_click">True</property>
+                <signal handler="exit_menu_cb" name="clicked"/>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="padding">0</property>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="pack_type">GTK_PACK_END</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+  </object>
+  <object class="GtkDialog" id="xscreensaver_settings_dialog">
+    <property name="title" translatable="yes">dialog1</property>
+    <property name="type">GTK_WINDOW_TOPLEVEL</property>
+    <property name="window_position">GTK_WIN_POS_NONE</property>
+    <property name="modal">False</property>
+    <property name="resizable">True</property>
+    <property name="destroy_with_parent">False</property>
+    <property name="decorated">True</property>
+    <property name="skip_taskbar_hint">False</property>
+    <property name="skip_pager_hint">False</property>
+    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+    <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+    <property name="focus_on_map">True</property>
+    <property name="urgency_hint">False</property>
+    <property name="has_separator">False</property>
+    <child internal-child="vbox">
+      <object class="GtkVBox" id="dialog_vbox">
+        <property name="visible">True</property>
+        <property name="homogeneous">False</property>
+        <property name="spacing">0</property>
+        <child internal-child="action_area">
+          <object class="GtkHButtonBox" id="dialog_action_area">
+            <property name="visible">True</property>
+            <property name="layout_style">GTK_BUTTONBOX_END</property>
+            <child>
+              <object class="GtkButton" id="adv_button">
+                <property name="visible">True</property>
+                <property name="can_default">True</property>
+                <property name="can_focus">True</property>
+                <property name="label" translatable="yes">_Advanced &gt;&gt;</property>
+                <property name="use_underline">True</property>
+                <property name="relief">GTK_RELIEF_NORMAL</property>
+                <property name="focus_on_click">True</property>
+                <signal handler="settings_adv_cb" name="clicked"/>
+              </object>
+            </child>
+            <child>
+              <object class="GtkButton" id="std_button">
+                <property name="visible">True</property>
+                <property name="can_default">True</property>
+                <property name="can_focus">True</property>
+                <property name="label" translatable="yes">_Standard &lt;&lt;</property>
+                <property name="use_underline">True</property>
+                <property name="relief">GTK_RELIEF_NORMAL</property>
+                <property name="focus_on_click">True</property>
+                <signal handler="settings_std_cb" name="clicked"/>
+              </object>
+            </child>
+            <child>
+              <object class="GtkButton" id="reset_button">
+                <property name="visible">True</property>
+                <property name="can_default">True</property>
+                <property name="can_focus">True</property>
+                <property name="label" translatable="yes">_Reset to Defaults</property>
+                <property name="use_underline">True</property>
+                <property name="relief">GTK_RELIEF_NORMAL</property>
+                <property name="focus_on_click">True</property>
+                <signal handler="settings_reset_cb" name="clicked"/>
+              </object>
+            </child>
+            <child>
+              <object class="GtkButton" id="cancel_button">
+                <property name="visible">True</property>
+                <property name="can_default">True</property>
+                <property name="can_focus">True</property>
+                <property name="label">gtk-cancel</property>
+                <property name="use_stock">True</property>
+                <property name="relief">GTK_RELIEF_NORMAL</property>
+                <property name="focus_on_click">True</property>
+                <signal handler="settings_cancel_cb" name="clicked"/>
+              </object>
+            </child>
+            <child>
+              <object class="GtkButton" id="ok_button">
+                <property name="visible">True</property>
+                <property name="can_default">True</property>
+                <property name="can_focus">True</property>
+                <property name="label">gtk-ok</property>
+                <property name="use_stock">True</property>
+                <property name="relief">GTK_RELIEF_NORMAL</property>
+                <property name="focus_on_click">True</property>
+                <signal handler="settings_ok_cb" name="clicked"/>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="padding">0</property>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="pack_type">GTK_PACK_END</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkVBox" id="vbox1">
+            <property name="visible">True</property>
+            <property name="homogeneous">False</property>
+            <property name="spacing">0</property>
+            <child>
+              <object class="GtkFrame" id="opt_frame">
+                <property name="visible">True</property>
+                <property name="label_xalign">0</property>
+                <property name="label_yalign">0</property>
+                <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
+                <accessibility>
+                  <relation target="label6" type="labelled-by"/>
+                </accessibility>
+                <child>
+                  <object class="GtkNotebook" id="opt_notebook">
+                    <property name="border_width">12</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="show_tabs">True</property>
+                    <property name="show_border">False</property>
+                    <property name="tab_pos">GTK_POS_BOTTOM</property>
+                    <property name="scrollable">False</property>
+                    <property name="enable_popup">False</property>
+                    <signal handler="settings_switch_page_cb" name="switch_page"/>
+                    <child>
+                      <object class="GtkVBox" id="settings_vbox">
+                        <property name="visible">True</property>
+                        <property name="homogeneous">False</property>
+                        <property name="spacing">0</property>
+                        <child>
+                          <placeholder/>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="tab_expand">True</property>
+                        <property name="tab_fill">True</property>
+                        <property name="tab_pack">GTK_PACK_END</property>
+                      </packing>
+                    </child>
+                    <child type="tab">
+                      <object class="GtkLabel" id="std_label">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">Standard</property>
+                        <property name="use_underline">False</property>
+                        <property name="use_markup">False</property>
+                        <property name="justify">GTK_JUSTIFY_LEFT</property>
+                        <property name="wrap">False</property>
+                        <property name="selectable">False</property>
+                        <property name="xalign">0.5</property>
+                        <property name="yalign">0.5</property>
+                        <property name="xpad">0</property>
+                        <property name="ypad">0</property>
+                        <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                        <property name="width_chars">-1</property>
+                        <property name="single_line_mode">False</property>
+                        <property name="angle">0</property>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkTable" id="adv_table">
+                        <property name="visible">True</property>
+                        <property name="n_rows">4</property>
+                        <property name="n_columns">2</property>
+                        <property name="homogeneous">False</property>
+                        <property name="row_spacing">0</property>
+                        <property name="column_spacing">0</property>
+                        <child>
+                          <object class="GtkImage" id="cmd_logo">
+                            <property name="visible">True</property>
+                            <property name="pixbuf">screensaver-cmndln.png</property>
+                            <property name="xalign">0.5</property>
+                            <property name="yalign">0.5</property>
+                            <property name="xpad">4</property>
+                            <property name="ypad">8</property>
+                          </object>
+                          <packing>
+                            <property name="left_attach">0</property>
+                            <property name="right_attach">1</property>
+                            <property name="top_attach">0</property>
+                            <property name="bottom_attach">1</property>
+                            <property name="x_options">fill</property>
+                            <property name="y_options">fill</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkLabel" id="cmd_label">
+                            <property name="visible">True</property>
+                            <property name="label" translatable="yes">_Command Line:</property>
+                            <property name="use_underline">True</property>
+                            <property name="use_markup">False</property>
+                            <property name="justify">GTK_JUSTIFY_LEFT</property>
+                            <property name="wrap">False</property>
+                            <property name="selectable">False</property>
+                            <property name="xalign">0</property>
+                            <property name="yalign">0.5</property>
+                            <property name="xpad">0</property>
+                            <property name="ypad">0</property>
+                            <property name="mnemonic_widget">cmd_text</property>
+                            <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                            <property name="width_chars">-1</property>
+                            <property name="single_line_mode">False</property>
+                            <property name="angle">0</property>
+                            <accessibility>
+                              <relation target="cmd_text" type="label-for"/>
+                            </accessibility>
+                          </object>
+                          <packing>
+                            <property name="left_attach">1</property>
+                            <property name="right_attach">2</property>
+                            <property name="top_attach">1</property>
+                            <property name="bottom_attach">2</property>
+                            <property name="x_options">fill</property>
+                            <property name="y_options"/>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkEntry" id="cmd_text">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="editable">True</property>
+                            <property name="visibility">True</property>
+                            <property name="max_length">0</property>
+                            <property name="text" translatable="yes"/>
+                            <property name="has_frame">True</property>
+                            <property name="invisible_char">*</property>
+                            <property name="activates_default">False</property>
+                            <accessibility>
+                              <relation target="cmd_label" type="labelled-by"/>
+                            </accessibility>
+                          </object>
+                          <packing>
+                            <property name="left_attach">1</property>
+                            <property name="right_attach">2</property>
+                            <property name="top_attach">2</property>
+                            <property name="bottom_attach">3</property>
+                            <property name="y_options"/>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkHBox" id="visual_hbox">
+                            <property name="visible">True</property>
+                            <property name="homogeneous">False</property>
+                            <property name="spacing">0</property>
+                            <child>
+                              <object class="GtkLabel" id="visual">
+                                <property name="visible">True</property>
+                                <property name="label" translatable="yes">_Visual:</property>
+                                <property name="use_underline">True</property>
+                                <property name="use_markup">False</property>
+                                <property name="justify">GTK_JUSTIFY_LEFT</property>
+                                <property name="wrap">False</property>
+                                <property name="selectable">False</property>
+                                <property name="xalign">1</property>
+                                <property name="yalign">0.5</property>
+                                <property name="xpad">3</property>
+                                <property name="ypad">0</property>
+                                <property name="mnemonic_widget">visual_combo</property>
+                                <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                                <property name="width_chars">-1</property>
+                                <property name="single_line_mode">False</property>
+                                <property name="angle">0</property>
+                                <accessibility>
+                                  <relation target="visual_combo" type="label-for"/>
+                                </accessibility>
+                              </object>
+                              <packing>
+                                <property name="padding">0</property>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkComboBoxEntry" id="visual_combo">
+                                <property name="has_entry">False</property>
+                                <property name="visible">True</property>
+                                <property name="model">visual_combo_model</property>
+                                <property name="text-column">0</property>
+                                <accessibility>
+                                  <relation target="visual" type="labelled-by"/>
+                                </accessibility>
+                                <child internal-child="entry">
+                                  <object class="GtkEntry" id="visual_entry">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="editable">True</property>
+                                    <property name="visibility">True</property>
+                                    <property name="max_length">0</property>
+                                    <property name="text" translatable="yes"/>
+                                    <property name="has_frame">True</property>
+                                    <property name="invisible_char">*</property>
+                                    <property name="activates_default">False</property>
+                                  </object>
+                                </child>
+                              </object>
+                              <packing>
+                                <property name="padding">0</property>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left_attach">1</property>
+                            <property name="right_attach">2</property>
+                            <property name="top_attach">3</property>
+                            <property name="bottom_attach">4</property>
+                            <property name="x_options">fill</property>
+                            <property name="y_options">fill</property>
+                          </packing>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="tab_expand">False</property>
+                        <property name="tab_fill">True</property>
+                      </packing>
+                    </child>
+                    <child type="tab">
+                      <object class="GtkLabel" id="adv_label">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">Advanced</property>
+                        <property name="use_underline">False</property>
+                        <property name="use_markup">False</property>
+                        <property name="justify">GTK_JUSTIFY_LEFT</property>
+                        <property name="wrap">False</property>
+                        <property name="selectable">False</property>
+                        <property name="xalign">0.5</property>
+                        <property name="yalign">0.5</property>
+                        <property name="xpad">0</property>
+                        <property name="ypad">0</property>
+                        <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                        <property name="width_chars">-1</property>
+                        <property name="single_line_mode">False</property>
+                        <property name="angle">0</property>
+                      </object>
+                    </child>
+                  </object>
+                </child>
+                <child type="label">
+                  <object class="GtkLabel" id="label6">
+                    <property name="visible">True</property>
+                    <property name="label" translatable="yes">Settings</property>
+                    <property name="use_underline">False</property>
+                    <property name="use_markup">False</property>
+                    <property name="justify">GTK_JUSTIFY_LEFT</property>
+                    <property name="wrap">False</property>
+                    <property name="selectable">False</property>
+                    <property name="xalign">0.5</property>
+                    <property name="yalign">0.5</property>
+                    <property name="xpad">0</property>
+                    <property name="ypad">0</property>
+                    <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                    <property name="width_chars">-1</property>
+                    <property name="single_line_mode">False</property>
+                    <property name="angle">0</property>
+                    <accessibility>
+                      <relation target="opt_frame" type="label-for"/>
+                    </accessibility>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="padding">0</property>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkFrame" id="doc_frame">
+                <property name="visible">True</property>
+                <property name="label_xalign">0</property>
+                <property name="label_yalign">0</property>
+                <property name="shadow_type">GTK_SHADOW_NONE</property>
+                <child>
+                  <object class="GtkVBox" id="doc_vbox">
+                    <property name="border_width">5</property>
+                    <property name="visible">True</property>
+                    <property name="homogeneous">False</property>
+                    <property name="spacing">5</property>
+                    <child>
+                      <object class="GtkLabel" id="doc">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="label" translatable="yes"/>
+                        <property name="use_underline">False</property>
+                        <property name="use_markup">False</property>
+                        <property name="justify">GTK_JUSTIFY_LEFT</property>
+                        <property name="wrap">True</property>
+                        <property name="selectable">True</property>
+                        <property name="xalign">0</property>
+                        <property name="yalign">0</property>
+                        <property name="xpad">0</property>
+                        <property name="ypad">0</property>
+                        <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                        <property name="width_chars">-1</property>
+                        <property name="single_line_mode">False</property>
+                        <property name="angle">0</property>
+                      </object>
+                      <packing>
+                        <property name="padding">0</property>
+                        <property name="expand">True</property>
+                        <property name="fill">True</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkHBox" id="hbox1">
+                        <property name="visible">True</property>
+                        <property name="homogeneous">False</property>
+                        <property name="spacing">0</property>
+                        <child>
+                          <object class="GtkButton" id="manual">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="label" translatable="yes">_Documentation...</property>
+                            <property name="use_underline">True</property>
+                            <property name="relief">GTK_RELIEF_NORMAL</property>
+                            <property name="focus_on_click">True</property>
+                            <signal handler="manual_cb" name="clicked"/>
+                          </object>
+                          <packing>
+                            <property name="padding">0</property>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="pack_type">GTK_PACK_END</property>
+                          </packing>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="padding">0</property>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                      </packing>
+                    </child>
+                  </object>
+                </child>
+                <child type="label">
+                  <object class="GtkLabel" id="label7">
+                    <property name="visible">True</property>
+                    <property name="label" translatable="yes"/>
+                    <property name="use_underline">False</property>
+                    <property name="use_markup">False</property>
+                    <property name="justify">GTK_JUSTIFY_LEFT</property>
+                    <property name="wrap">False</property>
+                    <property name="selectable">False</property>
+                    <property name="xalign">0.5</property>
+                    <property name="yalign">0.5</property>
+                    <property name="xpad">0</property>
+                    <property name="ypad">0</property>
+                    <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                    <property name="width_chars">-1</property>
+                    <property name="single_line_mode">False</property>
+                    <property name="angle">0</property>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="padding">0</property>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="padding">0</property>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+    <action-widgets>
+      <action-widget response="0">adv_button</action-widget>
+      <action-widget response="0">std_button</action-widget>
+      <action-widget response="0">reset_button</action-widget>
+      <action-widget response="-6">cancel_button</action-widget>
+      <action-widget response="-5">ok_button</action-widget>
+    </action-widgets>
+  </object>
+</interface>
diff --git a/driver/xscreensaver-getimage-file b/driver/xscreensaver-getimage-file
index 3a5c7f4..a22d001 100755
--- a/driver/xscreensaver-getimage-file
+++ b/driver/xscreensaver-getimage-file
@@ -53,7 +53,7 @@ BEGIN { eval 'use LWP::Simple;' }
 
 
 my $progname = $0; $progname =~ s@.*/@@g;
-my ($version) = ('$Revision: 1.53 $' =~ m/\s(\d[.\d]+)\s/s);
+my ($version) = ('$Revision: 1.57 $' =~ m/\s(\d[.\d]+)\s/s);
 
 my $verbose = 0;
 
@@ -84,7 +84,7 @@ my $feed_max_age = $cache_max_age;
 # them, but it assumes that you gave your images sensible file extensions.
 #
 my @good_extensions = ('jpg', 'jpeg', 'pjpeg', 'pjpg', 'png', 'gif',
-                       'tif', 'tiff', 'xbm', 'xpm');
+                       'tif', 'tiff', 'xbm', 'xpm', 'svg');
 my $good_file_re = '\.(' . join("|", @good_extensions) . ')$';
 
 # This matches file extensions that might occur in an image directory,
@@ -1120,8 +1120,21 @@ sub png_size($) {
 }
 
 
-# Given the raw body of a GIF, JPEG, or PNG document, returns the dimensions
-# of the image.
+# Given the raw body of an SVG document, returns the dimensions of the image.
+#
+sub svg_size($) {
+  my ($body) = @_;
+  return () unless ($body =~ m/^<\?xml\s/s);
+  return () unless ($body =~ m/<svg\s/si);
+  my ($w) = ($body =~ m@\swidth=[\"\'](\d+)[\"\']@si);
+  my ($h) = ($body =~ m@\sheight=[\"\'](\d+)[\"\']@si);
+  return () unless (defined ($w) && defined ($h));
+  return ($w, $h);
+}
+
+
+# Given the raw body of a GIF, JPEG, PNG or SVG document, returns the
+# dimensions of the image.
 #
 sub image_size($) {
   my ($body) = @_;
@@ -1130,6 +1143,8 @@ sub image_size($) {
   if ($w && $h) { return ($w, $h); }
   ($w, $h) = jpeg_size ($body);
   if ($w && $h) { return ($w, $h); }
+  ($w, $h) = svg_size ($body);
+  if ($w && $h) { return ($w, $h); }
   # #### TODO: need image parsers for TIFF, XPM, XBM.
   return png_size ($body);
 }
@@ -1182,13 +1197,24 @@ sub get_x11_prefs_1($) {
   my ($body) = @_;
 
   my $got_any_p = 0;
+  my $choosep = 1;
   $body =~ s@\\\n@@gs;
   $body =~ s@^[ \t]*#[^\n]*$@@gm;
 
-  if ($body =~ m/^[.*]*imageDirectory:[ \t]*([^\s]+)\s*$/im) {
-    $image_directory = $1;
-    $got_any_p = 1;
+  foreach my $line (split (/\n/, $body)) {
+    $line =~ s/#.*//s;
+    if ($line =~ m/^[.*]*imageDirectory:[ \t]*([^\s]+)\s*$/si) {
+      $image_directory = $1;
+      $got_any_p = 1;
+    } elsif ($line =~ m/^[.*]*chooseRandomImages:[ \t]*([^\s]+)\s*$/si) {
+      $choosep = ($1 =~ m/^true$/si ? 1 : 0);
+      $got_any_p = 1;
+    }
   }
+
+  # Don't allow image files to be loaded if chooseRandomImages is false.
+  $image_directory = undef unless $choosep;
+
   return $got_any_p;
 }
 
@@ -1276,12 +1302,11 @@ sub main() {
     }
 
     if (defined ($cocoa_id)) {
-      get_cocoa_prefs($cocoa_id);
-      error ("no imageDirectory in $cocoa_id") unless $image_directory;
+      get_cocoa_prefs ($cocoa_id);
     } else {
       get_x11_prefs();
-      error ("no imageDirectory in X11 resources") unless $image_directory;
     }
+    error ("image file loading is not configured") unless $image_directory;
   }
 
   usage unless (defined($image_directory));
diff --git a/driver/xscreensaver-getimage-video b/driver/xscreensaver-getimage-video
index dbc8986..d0f242e 100755
--- a/driver/xscreensaver-getimage-video
+++ b/driver/xscreensaver-getimage-video
@@ -30,7 +30,7 @@ require 5;
 use strict;
 
 my $progname = $0; $progname =~ s@.*/@@g;
-my $version  = q{ $Revision: 1.23 $ }; $version =~ s/^[^0-9]+([0-9.]+).*$/$1/;
+my $version  = q{ $Revision: 1.24 $ }; $version =~ s/^[^0-9]+([0-9.]+).*$/$1/;
 
 my $tmpdir   = $ENV{TMPDIR} || "/tmp";
 my $tmpfile  = sprintf("%s/xssv.%08x.ppm", $tmpdir, rand(0xFFFFFFFF));
@@ -69,8 +69,7 @@ my @programs = (
   "vidtomem -f $tmpfile 2>&- " .		# Silicon Graphics
 	"&& mv $tmpfile-00000.rgb $tmpfile",
 
-  # Maybe this works?
-  # "ffmpeg -i /dev/video0 -ss 00:00:01 -vframes 1 $tmpfile 2>&-",
+  "ffmpeg -y -v quiet -i /dev/video0 -vframes:v 1 $escaped_tmpfile 2>&-",
 
   # "mplayer -really-quiet tv://0 " .		# Maybe works with some cams?
   #         "-ao null -vo pnm -frames 1 2>&- " .
@@ -124,7 +123,7 @@ sub grab_image() {
 
 
 sub usage() {
-  print STDERR "usage: $progname [--verbose] [--name | --stdout]\n";
+  print STDERR "usage: $progname [--verbose] [--name]\n";
   exit 1;
 }
 
diff --git a/driver/xscreensaver-getimage.c b/driver/xscreensaver-getimage.c
index 092540d..1009cb7 100644
--- a/driver/xscreensaver-getimage.c
+++ b/driver/xscreensaver-getimage.c
@@ -1,4 +1,4 @@
-/* xscreensaver, Copyright (c) 2001-2018 by Jamie Zawinski <jwz@jwz.org>
+/* xscreensaver, Copyright (c) 2001-2020 by 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
@@ -52,11 +52,24 @@
 
 #ifdef HAVE_GDK_PIXBUF
 # undef HAVE_JPEGLIB
+
+# if (__GNUC__ >= 4)	/* Ignore useless warnings generated by GTK headers */
+#  pragma GCC diagnostic push
+#  pragma GCC diagnostic ignored "-Wlong-long"
+#  pragma GCC diagnostic ignored "-Wvariadic-macros"
+#  pragma GCC diagnostic ignored "-Wpedantic"
+# endif
+
 # ifdef HAVE_GTK2
 #  include <gdk-pixbuf-xlib/gdk-pixbuf-xlib.h>
 # else  /* !HAVE_GTK2 */
 #  include <gdk-pixbuf/gdk-pixbuf-xlib.h>
 # endif /* !HAVE_GTK2 */
+
+# if (__GNUC__ >= 4)
+#  pragma GCC diagnostic pop
+# endif
+
 #endif /* HAVE_GDK_PIXBUF */
 
 #ifdef HAVE_JPEGLIB
@@ -766,6 +779,13 @@ maybe_read_ppm (Screen *screen, Visual *visual,
                progname, filename);
       goto FAIL;
     }
+  else if (!strncasecmp (buf, "<?xml", 5))
+    {
+      fprintf (stderr, "%s: %s: sorry, SVG files not supported"
+               " when compiled with JPEGlib instead of GDK_Pixbuf.\n",
+               progname, filename);
+      goto FAIL;
+    }
 
   if (strncmp (s, "P6", 2))
     goto FAIL;
diff --git a/driver/xscreensaver-systemd.c b/driver/xscreensaver-systemd.c
index a46ed4d..2da99de 100644
--- a/driver/xscreensaver-systemd.c
+++ b/driver/xscreensaver-systemd.c
@@ -1,4 +1,5 @@
-/* xscreensaver-systemd, Copyright (c) 2019 Martin Lucina <martin@lucina.net>
+/* xscreensaver-systemd, Copyright (c) 2019-2020
+ * Martin Lucina <martin@lucina.net> and Jamie Zawinski <jwz@jwz.org>
  *
  * ISC License
  *
@@ -16,217 +17,911 @@
  * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
- * This is a small utility providing systemd integration for XScreenSaver.
  *
- * When run from ~/.xsession or equivalent, this will:
+ * This utility provides systemd integration for XScreenSaver.
+ * It does two things:
  *
- *   - Lock the screen before the system goes to sleep (using
- *     xscreensaver-command -suspend).
+ *   - When the system is about to go to sleep (e.g., laptop lid closing)
+ *     it locks the screen *before* the system goes to sleep, by running
+ *     "xscreensaver-command -suspend".  And then when the system wakes
+ *     up again, it runs "xscreensaver-command -deactivate" to force the
+ *     unlock dialog to appear immediately.
  *
- *   - Ensure the XScreenSaver password dialog is shown after the system
- *     is resumed (using xscreensaver-command -deactivate).
+ *   - When another process on the system makes asks for the screen saver
+ *     to be inhibited (e.g. because a video is playing) this program
+ *     periodically runs "xscreensaver-command -deactivate" to keep the
+ *     display un-blanked.  It does this until the other program asks for
+ *     it to stop.
  *
- * This is implemented using the recommended way to do these things
- * nowadays, namely inhibitor locks. sd-bus is used for DBUS communication,
- * so the only dependency is libsystemd (which you already have if you
- * want this).
+ *
+ * Background:
+ *
+ *     For decades, the traditional way for a video player to temporarily
+ *     inhibit the screen saver was to have a heartbeat command that ran
+ *     "xscreensaver-command -deactivate" once a minute while the video was
+ *     playing, and ceased when the video was paused or stopped.  The reason
+ *     to do it as a heartbeat rather than a toggle is so that the player
+ *     fails SAFE -- if the player exits abnormally, the heart stops beating,
+ *     and screen saving and locking resumes.
+ *
+ *     These days, the popular apps do this by using systemd.  The design of
+ *     the systemd method easily and trivially allows an app to inhibit the
+ *     screen saver, crash, and then never un-inhibit it, so now your screen
+ *     will never blank again.
+ *
+ *     Furthermore, since the systemd method uses cookies to ensure that only
+ *     the app that sent "inhibit" can send the matching "uninhibit", simply
+ *     re-launching the crashed video player does not fix the problem.
+ *
+ *         "Did IQs just drop sharply while I was away?" -- Ellen Ripley
+ *
+ *     So here's what we're dealing with now, with the various apps you might
+ *     use to play video on Linux at the end of 2020:
+ *
+ *
+ *****************************************************************************
+ *
+ * Firefox (version 78.5)
+ *
+ *     When playing media, Firefox will send "inhibit" to one of these
+ *     targets: "org.freedesktop.ScreenSaver" or "org.gnome.SessionManager".
+ *
+ *     However, Firefox decides which, if any, of those to use at launch time,
+ *     and does not revisit that decision.  So if xscreensaver-systemd has not
+ *     been launched before Firefox, it won't work.  Fortunately, in most use
+ *     cases, xscreensaver will have been launched earlier in the startup
+ *     sequence than the web browser.
+ *
+ *     If you close the tab or exit while playing, Firefox sends "uninhibit".
+ *
+ * Critical Firefox Bug:
+ *
+ *     If Firefox crashes or is killed while playing, it never sends
+ *     "uninhibit", leaving the screen saver permanently inhibited.  Once
+ *     that happens, the only way to un-fuck things is to kill and restart
+ *     the "xscreensaver-systemd" program.
+ *
+ * Annoying Firefox Bug:
+ *
+ *     Firefox sends an "inhibit" message when it is merely playing audio.
+ *     That's horrible.  Playing audio should prevent your machine from going
+ *     to sleep, but it should NOT prevent your screen from blanking or
+ *     locking.
+ *
+ *     However at least it sends it with the reason "audio-playing" instead
+ *     of "video-playing", meaning we can (and do) special-case Firefox and
+ *     ignore that one.
+ *
+ *
+ *****************************************************************************
+ *
+ * Chrome (version 87)
+ *
+ *     Sends "inhibit" to "org.freedesktop.ScreenSaver" (though it uses a
+ *     a different object path than Firefox does).  Unlike Firefox, Chrome
+ *     does not send an "inhibit" message when only audio is playing.
+ *
+ * Critical Chrome Bug:
+ *
+ *     If Chrome crashes or is killed while playing, it never sends
+ *     "uninhibit", leaving the screen saver permanently inhibited.
+ *
+ *
+ *****************************************************************************
+ *
+ * Chromium (version 78, Raspbian 10.4)
+ *
+ *     Does not use "org.freedesktop.ScreenSaver" or "xdg-screensaver".
+ *     It appears to make no attempt to inhibit the screen saver while
+ *     video is playing.
+ *
+ *
+ *****************************************************************************
+ *
+ * Chromium (version 84.0.4147.141, Raspbian 10.6)
+ *
+ *     Sends "inhibit" to "org.freedesktop.ScreenSaver" (though it uses a
+ *     a different object path than Firefox does).  Unlike Firefox, Chrome
+ *     does not send an "inhibit" message when only audio is playing.
+ *
+ *     If you close the tab or exit while playing, Chromium sends "uninhibit".
+ *
+ * Critical Chromium Bug:
+ *
+ *     If Chromium crashes or is killed while playing, it never sends
+ *     "uninhibit", leaving the screen saver permanently inhibited.
+ *
+ * Annoying Chromium Bug:
+ *
+ *     Like Firefox, Chromium sends an "inhibit" message when it is merely
+ *     playing audio.  Unlike Firefox, it sends exactly the same "reason"
+ *     string as it does when playing video, so we can't tell them apart.
+ *
+ *
+ *****************************************************************************
+ *
+ * MPV (version 0.29.1)
+ *
+ *     While playing, it runs "xdg-screensaver reset" every 10 seconds as a
+ *     heartbeat.  That program is a super-complicated shell script that will
+ *     eventually run "xscreensaver-command -reset".  So MPV talks to the
+ *     xscreensaver daemon directly rather than going through systemd.
+ *     That's fine.
+ *
+ *     On Debian 10.4 and 10.6, MPV does not have a dependency on the
+ *     "xdg-utils" package, so "xdg-screensaver" might not be installed.
+ *     Oddly, Chromium *does* have a dependency on "xdg-utils", even though
+ *     Chromium doesn't run "xdg-screensaver".
+ *
+ *     The source code suggests that MPlayer and MPV call XResetScreenSaver()
+ *     as well, but only affects the X11 server's built-in screen saver, not
+ *     a userspace screen locker like xscreensaver.
+ *
+ *     They also call XScreenSaverSuspend() which is part of the MIT
+ *     SCREEN-SAVER server extension.  XScreenSaver does make use of that
+ *     extension because it is worse than useless.  See the commentary at
+ *     the top of xscreensaver.c for details.
+ *
+ * Annoying MPV Bug:
+ *
+ *     Like Firefox and Chromium, MPV inhibits screen blanking when only
+ *     audio is playing.
+ *
+ *
+ *****************************************************************************
+ *
+ * MPlayer (version mplayer-gui 2:1.3.0)
+ *
+ *     I can't get this thing to play video at all.  It only plays the audio
+ *     of MP4 files, so I can't guess what it might or might not do with video.
+ *     It appears to make no attempt to inhibit the screen saver.
+ *
+ *
+ *****************************************************************************
+ *
+ * VLC (version 3.0.11-0+deb10u1+rpt3)
+ *
+ *     VLC sends "inhibit" to "org.freedesktop.ScreenSaver" when playing
+ *     video.  It does not send "inhibit" when playing audio only, and it
+ *     sends "uninhibit" under all the right circumstances.
+ *
+ *     NOTE: that's what I saw when I tested it on Raspbian 10.6. However,
+ *     the version that came with Raspbian 10.4 -- which also called itself
+ *     "VLC 3.0.11" -- did not send "uninhibit" when using the window
+ *     manager's "close" button!  Or when killed with "kill".
+ *
+ *     NOTE ALSO: The VLC source code suggests that under some circumstances
+ *     it might be talking to these instead: "org.freedesktop.ScreenSaver",
+ *     "org.freedesktop.PowerManagement.Inhibit", "org.mate.SessionManager",
+ *     and/or "org.gnome.SessionManager".  It also contains code to run
+ *     "xdg-screensaver reset" as a heartbeat.  I can't tell how it decides
+ *     which system to use.  I have never seen it run "xdg-screensaver".
+ *
+ *
+ *****************************************************************************
+ *
+ * TO DO:
+ *
+ *   - What does the standalone Zoom executable do on Linux?  There doesn't
+ *     seem to be a Raspbian build, so I can't test it.
+ *
+ *   - Since the systemd misdesign allows a program to call "inhibit" and
+ *     then crash without un-inhibiting, it would be sensible for us to
+ *     auto-uninhibit if the inhibiting process's pid goes away, but it
+ *     seems that sd_bus_creds_get_pid() never works, so we can't do that.
+ *     This is going to be a constant problem!
+ *
+ *   - xscreensaver_method_uninhibit() does not actually send a reply, are
+ *     we doing the right thing when registering it?
+ *
+ *   - Currently this code is only listening to "org.freedesktop.ScreenSaver".
+ *     Perhaps it should listen to "org.mate.SessionManager" and
+ *     "org.gnome.SessionManager"?  Where are those documented?
+ *
+ *   - Do we need to call sd_bus_release_name() explicitly on exit?
+ *
+ *   - Run under valgrind to check for any memory leaks.
+ *
+ *
+ * TESTING:
+ *
+ *   To call the D-BUS methods manually, you can use "busctl":
+ *
+ *   busctl --user call org.freedesktop.ScreenSaver \
+ *     /ScreenSaver org.freedesktop.ScreenSaver \
+ *     Inhibit ss test-application test-reason
+ *
+ *   This will hand out a cookie, which you can pass back to UnInhibit:
+ *
+ *   u 1792821391
+ *
+ *   busctl --user call org.freedesktop.ScreenSaver \
+ *     /ScreenSaver org.freedesktop.ScreenSaver \
+ *     UnInhibit u 1792821391
  *
  * https://github.com/mato/xscreensaver-systemd
  */
 
-#include <assert.h>
-#include <err.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#define _GNU_SOURCE
+#include <stdio.h>
+#include <poll.h>
 #include <errno.h>
+#include <stdint.h>
 #include <stdlib.h>
+#include <string.h>
 #include <sys/wait.h>
 #include <unistd.h>
+#include <time.h>
+#include <sys/time.h>
+#include <sys/types.h>
+#include <signal.h>
+
+#include "yarandom.h"
+
+#ifdef HAVE_LIBSYSTEMD
+# include <systemd/sd-bus.h>
+
+#else   /* !HAVE_LIBSYSTEMD */
+
+ /* This is a testing shim so that I can somewhat test this even on
+    machines that only have libsystemd < 221, such as CentOS 7.7...
+  */
+ typedef struct sd_bus sd_bus;
+ typedef struct sd_bus_message sd_bus_message;
+ typedef struct sd_bus_slot sd_bus_slot;
+ typedef struct sd_bus_creds sd_bus_creds;
+ typedef struct { char *message; } sd_bus_error;
+ typedef int (*sd_bus_message_handler_t)
+   (sd_bus_message *m, void *userdata, sd_bus_error *ret_error);
+ #define SD_BUS_ERROR_NULL { 0 }
+ static int sd_bus_message_read (sd_bus_message *m, char *types, ...)
+   { return -1; }
+ static sd_bus_message *sd_bus_message_unref(sd_bus_message *m) { return 0; }
+ static void sd_bus_error_free(sd_bus_error *e) { }
+ static int sd_bus_call_method(sd_bus *bus, const char *destination,
+                               const char *path, const char *interface,
+                               const char *member, sd_bus_error *ret_error,
+                               sd_bus_message **reply, const char *types, ...)
+   { return -1; }
+ static int sd_bus_open_user(sd_bus **ret) { return -1; }
+ static int sd_bus_request_name(sd_bus *bus, const char *name, uint64_t flags)
+   { return -1; }
+ static int sd_bus_open_system(sd_bus **ret) { return -1; }
+ static int sd_bus_add_match(sd_bus *bus, sd_bus_slot **slot,
+                             const char *match,
+                             sd_bus_message_handler_t callback, void *userdata)
+   { return -1; }
+ static int sd_bus_process(sd_bus *bus, sd_bus_message **r) { return -1; }
+ static sd_bus *sd_bus_flush_close_unref(sd_bus *bus) { return 0; }
+ static void sd_bus_message_ref(sd_bus_message *r) { }
+ static int sd_bus_reply_method_return (sd_bus_message *call,
+                                        const char *types, ...) { return -1; }
+ typedef int (*sd_bus_message_handler_t) (sd_bus_message *m, void *userdata,
+                                          sd_bus_error *ret_error);
+ struct sd_bus_vtable { const char *a; const char *b; const char *c;
+                        sd_bus_message_handler_t d; int e; };
+ typedef struct sd_bus_vtable sd_bus_vtable;
+# define SD_BUS_VTABLE_START(_flags) { 0 }
+# define SD_BUS_VTABLE_END /**/
+# define SD_BUS_VTABLE_UNPRIVILEGED -1
+# define SD_BUS_METHOD(_member, _signature, _result, _handler, _flags) { \
+   _member, _signature, _result, _handler, _flags }
+ static int sd_bus_add_object_vtable(sd_bus *bus, sd_bus_slot **slot,
+                                     const char *path, const char *interface,
+                                     const sd_bus_vtable *vtable,
+                                     void *userdata) { return -1; }
+ static int sd_bus_get_fd(sd_bus *bus) { return -1; }
+ static int sd_bus_get_events(sd_bus *bus) { return -1; }
+ static int sd_bus_get_timeout (sd_bus *bus, uint64_t *u) { return -1; }
+ static sd_bus_creds *sd_bus_message_get_creds (sd_bus_message *m) {return 0;}
+ static int sd_bus_creds_get_pid(sd_bus_creds *c, pid_t *p) { return -1; }
+#endif /* !HAVE_LIBSYSTEMD */
+
+#include "queue.h"
+#include "version.h"
+
+static char *progname;
+static char *screensaver_version;
+static int verbose_p = 0;
+
+#define DBUS_CLIENT_NAME     "org.jwz.XScreenSaver"
+#define DBUS_SD_SERVICE_NAME "org.freedesktop.login1"
+#define DBUS_SD_OBJECT_PATH  "/org/freedesktop/login1"
+#define DBUS_SD_INTERFACE    "org.freedesktop.login1.Manager"
+#define DBUS_SD_METHOD       "Inhibit"
+#define DBUS_SD_METHOD_ARGS  "ssss"
+#define DBUS_SD_METHOD_WHAT  "sleep"
+#define DBUS_SD_METHOD_WHO   "xscreensaver"
+#define DBUS_SD_METHOD_WHY   "lock screen on suspend"
+#define DBUS_SD_METHOD_MODE  "delay"
+
+#define DBUS_SD_MATCH "type='signal'," \
+                      "interface='" DBUS_SD_INTERFACE "'," \
+                      "member='PrepareForSleep'"
+
+#define DBUS_FDO_NAME          "org.freedesktop.ScreenSaver"
+#define DBUS_FDO_OBJECT_PATH   "/ScreenSaver"			/* Firefox */
+#define DBUS_FDO_OBJECT_PATH_2 "/org/freedesktop/ScreenSaver"	/* Chrome  */
+#define DBUS_FDO_INTERFACE     "org.freedesktop.ScreenSaver"
+
+#define HEARTBEAT_INTERVAL 50  /* seconds */
 
-#include <systemd/sd-bus.h>
 
 struct handler_ctx {
-    sd_bus *bus;
-    sd_bus_message *lock;
+  sd_bus *system_bus;
+  sd_bus_message *lock_message;
+  int lock_fd;
+  int is_inhibited;
+};
+
+static struct handler_ctx global_ctx = { NULL, NULL, -1 };
+
+SLIST_HEAD(inhibit_head, inhibit_entry) inhibit_head =
+  SLIST_HEAD_INITIALIZER(inhibit_head);
+
+struct inhibit_entry {
+  uint32_t cookie;
+  pid_t pid;
+  time_t start_time;
+  char *appname;
+  SLIST_ENTRY(inhibit_entry) entries;
 };
-static struct handler_ctx global_ctx = { NULL, NULL };
 
-static int handler(sd_bus_message *m, void *arg,
-        sd_bus_error *ret_error)
+
+static const char *
+blurb (void)
 {
-    struct handler_ctx *ctx = arg;
-    int before_sleep;
-    int rc;
-    sd_bus_error error = SD_BUS_ERROR_NULL;
-    sd_bus_message *reply = NULL;
-    int fd;
-
-    rc = sd_bus_message_read(m, "b", &before_sleep);
-    if (rc < 0) {
-        warnx("Failed to read message: %s", strerror(-rc));
-        return 0;
-    }
+  static char buf[255];
+  time_t now = time ((time_t *) 0);
+  char ct[100];
+  int n = strlen(progname);
+  if (n > 100) n = 99;
+  strncpy(buf, progname, n);
+  buf[n++] = ':';
+  buf[n++] = ' ';
+  ctime_r (&now, ct);
+  strncpy(buf+n, ct+11, 8);
+  strcpy(buf+n+9, ": ");
+  return buf;
+}
 
-    /* Use the scheme described at
-     * https://www.freedesktop.org/wiki/Software/systemd/inhibit/
-     * under "Taking Delay Locks".
-     */
-    if (before_sleep) {
-        rc = system("xscreensaver-command -suspend");
-        if (rc == -1) {
-            warnx("Failed to run xscreensaver-command");
-        }
-        else if (WEXITSTATUS(rc) != 0) {
-            warnx("xscreensaver-command failed with %d", WEXITSTATUS(rc));
-        }
 
-        if (ctx->lock) {
-            /*
-             * This will release the lock, since we hold the only ref to the
-             * message, and sd_bus_message_unref() will close the underlying
-             * fd.
-             */
-            sd_bus_message_unref(ctx->lock);
-            ctx->lock = NULL;
-        }
-        else {
-            warnx("Warning: ctx->lock is NULL, this should not happen?");
-        }
-    }
-    else {
-        rc = system("xscreensaver-command -deactivate");
-        if (rc == -1) {
-            warnx("Failed to run xscreensaver-command");
-        }
-        else if (WEXITSTATUS(rc) != 0) {
-            warnx("xscreensaver-command exited with %d", WEXITSTATUS(rc));
-        }
+static void
+xscreensaver_command (const char *cmd)
+{
+  char buf[1024];
+  int rc;
+  sprintf (buf, "xscreensaver-command %.100s -%.100s",
+           (verbose_p ? "-verbose" : "-quiet"),
+           cmd);
+  if (verbose_p)
+    fprintf (stderr, "%s: exec: %s\n", blurb(), buf);
+  rc = system (buf);
+  if (rc == -1)
+    fprintf (stderr, "%s: exec failed: %s\n", blurb(), buf);
+  else if (WEXITSTATUS(rc) != 0)
+    fprintf (stderr, "%s: exec: \"%s\" exited with status %d\n", 
+             blurb(), buf, WEXITSTATUS(rc));
+}
 
-        rc = sd_bus_call_method(ctx->bus,
-                "org.freedesktop.login1",
-                "/org/freedesktop/login1",
-                "org.freedesktop.login1.Manager",
-                "Inhibit",
-                &error,
-                &reply,
-                "ssss",
-                "sleep",
-                "xscreensaver",
-                "lock screen on suspend",
-                "delay");
-        if (rc < 0) {
-            warnx("Failed to call Inhibit(): %s", error.message);
-            goto out;
-        }
-        /*
-         * Verify that the reply actually contains a lock fd.
-         */
-        rc = sd_bus_message_read(reply, "h", &fd);
-        if (rc < 0) {
-            warnx("Failed to read message: %s", strerror(-rc));
-            goto out;
-        }
-        assert(fd >= 0);
-        ctx->lock = reply;
 
-out:
-        sd_bus_error_free(&error);
+static int
+xscreensaver_register_sleep_lock (struct handler_ctx *ctx)
+{
+  sd_bus_error error = SD_BUS_ERROR_NULL;
+  sd_bus_message *reply = NULL;
+  int fd = -1;
+  int rc = sd_bus_call_method (ctx->system_bus,
+                               DBUS_SD_SERVICE_NAME, DBUS_SD_OBJECT_PATH,
+                               DBUS_SD_INTERFACE, DBUS_SD_METHOD,
+                               &error, &reply,
+                               DBUS_SD_METHOD_ARGS,
+                               DBUS_SD_METHOD_WHAT, DBUS_SD_METHOD_WHO,
+                               DBUS_SD_METHOD_WHY, DBUS_SD_METHOD_MODE);
+  if (rc < 0) {
+    fprintf (stderr, "%s: inhibit sleep failed: %s\n", 
+             blurb(), error.message);
+    goto DONE;
+  }
+
+  /* Save the lock fd and explicitly take a ref to the lock message. */
+  rc = sd_bus_message_read (reply, "h", &fd);
+  if (rc < 0 || fd < 0) {
+    fprintf (stderr, "%s: inhibit sleep failed: no lock fd: %s\n",
+             blurb(), strerror(-rc));
+    goto DONE;
+  }
+  sd_bus_message_ref(reply);
+  ctx->lock_message = reply;
+  ctx->lock_fd = fd;
+
+ DONE:
+  sd_bus_error_free (&error);
+
+  return rc;
+}
+
+
+/* Called when DBUS_SD_INTERFACE sends a "PrepareForSleep" signal.
+   The event is sent twice: before sleep, and after.
+ */
+static int
+xscreensaver_systemd_handler (sd_bus_message *m, void *arg,
+                              sd_bus_error *ret_error)
+{
+  struct handler_ctx *ctx = arg;
+  int before_sleep;
+  int rc;
+
+  rc = sd_bus_message_read (m, "b", &before_sleep);
+  if (rc < 0) {
+    fprintf (stderr, "%s: message read failed: %s\n",
+             blurb(), strerror(-rc));
+    return 1;  /* >= 0 means success */
+  }
+
+  /* Use the scheme described at
+     https://www.freedesktop.org/wiki/Software/systemd/inhibit/
+     under "Taking Delay Locks".
+   */
+
+  if (before_sleep) {
+    /* Tell xscreensaver that we are suspending, and to lock if desired. */
+    xscreensaver_command ("suspend");
+
+    if (ctx->lock_message) {
+      /* Release the lock, meaning we are done and it's ok to sleep now.
+         Don't rely on unref'ing the message to close the fd, do that
+         explicitly here.
+      */
+      close(ctx->lock_fd);
+      sd_bus_message_unref (ctx->lock_message);
+      ctx->lock_message = NULL;
+      ctx->lock_fd = -1;
+    } else {
+      fprintf (stderr, "%s: no context lock\n", blurb());
     }
+  } else {
+    /* Tell xscreensaver to present the unlock dialog right now. */
+    xscreensaver_command ("deactivate");
+
+    /* We woke from sleep, so we need to re-register for the next sleep. */
+    rc = xscreensaver_register_sleep_lock (ctx);
+    if (rc < 0)
+      fprintf (stderr, "%s: could not re-register sleep lock\n", blurb());
+  }
 
-    return 0;
+  return 1;  /* >= 0 means success */
 }
 
-int main(int argc, char *argv[])
+
+/* Called from the vtable when another process sends a request to systemd
+   to inhibit the screen saver.  We return to them a cookie which they must
+   present with their "uninhibit" request.
+ */
+static int
+xscreensaver_method_inhibit (sd_bus_message *m, void *arg,
+                             sd_bus_error *ret_error)
 {
-    sd_bus *bus = NULL, *user_bus = NULL;
-    sd_bus_slot *slot = NULL;
-    struct handler_ctx *ctx = &global_ctx;
-    sd_bus_error error = SD_BUS_ERROR_NULL;
-    sd_bus_message *reply = NULL;
-    int rc;
-    int fd;
-    const char *match =
-        "type='signal',interface='org.freedesktop.login1.Manager'"
-        ",member='PrepareForSleep'";
-
-    rc = sd_bus_open_user(&user_bus);
-    if (rc < 0) {
-        warnx("Failed to connect to user bus: %s", strerror(-rc));
-        goto out;
+  struct handler_ctx *ctx = arg;
+  const char *application_name = 0, *inhibit_reason = 0;
+  struct inhibit_entry *entry = 0;
+  sd_bus_creds *creds = 0;
+  pid_t pid = 0;
+  const char *s;
+
+  int rc = sd_bus_message_read(m, "ss", &application_name, &inhibit_reason);
+  if (rc < 0) {
+    fprintf (stderr, "%s: failed to parse method call: %s\n",
+             blurb(), strerror(-rc));
+    return rc;
+  }
+
+  if (!application_name || !*application_name) {
+    fprintf (stderr, "%s: no app name in method call\n", blurb());
+    return -1;
+  }
+
+  if (!inhibit_reason || !*inhibit_reason) {
+    fprintf (stderr, "%s: no reason in method call from \"%s\"\n",
+             blurb(), application_name);
+    return -1;
+  }
+
+  /* Omit directory (Chrome does this shit) */
+  s = strrchr (application_name, '/');
+  if (s && s[1]) application_name = s+1;
+
+  if (strcasestr (inhibit_reason, "audio") &&
+      !strcasestr (inhibit_reason, "video")) {
+    /* Firefox 78 sends an inhibit when playing audio only, with reason
+       "audio-playing".  This is horrible.  Ignore it.  (But perhaps it
+       would be better to accept it, issue them a cookie, and then just
+       ignore that entry?) */
+    if (verbose_p)
+      fprintf (stderr, "%s: inhibited by \"%s\" with \"%s\", ignored\n",
+               blurb(), application_name, inhibit_reason);
+    return -1;
+  }
+
+  /* Get the pid of the process that called inhibit, so that we can
+     auto-uninhibit if that process dies.  We need to do this because so
+     many apps do not fail safe, and systemd's design doesn't enforce that.
+
+     Welp, this doesn't work.  We get ENODATA any time we try to get the
+     pid of the message sender.  FFFFFFFfffffffuuuuuuu......
+
+     Other things that do not work include: sd_bus_creds_get_exe,
+     sd_bus_creds_get_cmdline and sd_bus_creds_get_description.  So maybe
+     we could go through the process table and find a pid whose command
+     line matches application_name, but there's no guarantee that those are
+     the same.
+  */
+  creds = sd_bus_message_get_creds (m);
+  if (!creds) {
+    if (verbose_p)
+      fprintf (stderr, "%s: inhibit: unable to get creds of \"%s\"\n",
+               blurb(), application_name);
+  } else {
+    rc = sd_bus_creds_get_pid (creds, &pid);
+    if (rc < 0 || pid <= 0) {
+      pid = 0;
+      if (verbose_p)
+        fprintf (stderr, "%s: inhibit: unable to get pid of \"%s\": %s\n",
+                 blurb(), application_name, strerror(-rc));
     }
-    rc = sd_bus_request_name(user_bus, "org.jwz.XScreenSaver", 0);
-    if (rc < 0) {
-        warnx("Failed to acquire well-known name: %s", strerror(-rc));
-        warnx("Is another copy of xscreensaver-systemd running?");
-        goto out;
+  }
+
+  entry = malloc(sizeof (struct inhibit_entry));
+  entry->cookie = ya_random();
+  entry->appname = strdup(application_name);
+  entry->pid = pid;
+  entry->start_time = time ((time_t *)0);
+  SLIST_INSERT_HEAD(&inhibit_head, entry, entries);
+  ctx->is_inhibited++;
+  if (verbose_p)
+    fprintf (stderr, "%s: inhibited by \"%s\" with \"%s\" -> cookie %08X\n",
+             blurb(), application_name, inhibit_reason, entry->cookie);
+
+  return sd_bus_reply_method_return (m, "u", entry->cookie);
+}
+
+
+/* Called from the vtable when another process sends a request to systemd
+   to uninhibit the screen saver.  The cookie must match an earlier "inhibit"
+   request.
+ */
+static int
+xscreensaver_method_uninhibit (sd_bus_message *m, void *arg,
+                               sd_bus_error *ret_error)
+{
+  struct handler_ctx *ctx = arg;
+  uint32_t cookie;
+  struct inhibit_entry *entry;
+  int found = 0;
+
+  int rc = sd_bus_message_read (m, "u", &cookie);
+  if (rc < 0) {
+    fprintf (stderr, "%s: failed to parse method call: %s\n",
+             blurb(), strerror(-rc));
+    return rc;
+  }
+
+  SLIST_FOREACH(entry, &inhibit_head, entries) {
+    if (entry->cookie == cookie) {
+      if (verbose_p)
+        fprintf (stderr, "%s: uninhibited by \"%s\" with cookie %08X\n",
+                 blurb(), entry->appname, cookie);
+      SLIST_REMOVE (&inhibit_head, entry, inhibit_entry, entries);
+      if (entry->appname) free (entry->appname);
+      free(entry);
+      ctx->is_inhibited--;
+      if (ctx->is_inhibited < 0)
+        ctx->is_inhibited = 0;
+      found = 1;
+      break;
     }
+  }
 
-    rc = sd_bus_open_system(&bus);
-    if (rc < 0) {
-        warnx("Failed to connect to system bus: %s", strerror(-rc));
-        goto out;
+  if (! found)
+    fprintf (stderr, "%s: uninhibit: no match for cookie %08X\n",
+             blurb(), cookie);
+
+  return sd_bus_reply_method_return (m, "");
+}
+
+/*
+ * This vtable defines the service interface we implement.
+ */
+static const sd_bus_vtable
+xscreensaver_dbus_vtable[] = {
+    SD_BUS_VTABLE_START(0),
+    SD_BUS_METHOD("Inhibit", "ss", "u", xscreensaver_method_inhibit,
+                  SD_BUS_VTABLE_UNPRIVILEGED),
+    SD_BUS_METHOD("UnInhibit", "u", "", xscreensaver_method_uninhibit,
+                  SD_BUS_VTABLE_UNPRIVILEGED),
+    SD_BUS_VTABLE_END
+};
+
+
+static int
+pid_dead (pid_t pid)
+{
+  int rc = kill (pid, 0);
+  if (rc == 0) return 0;	/* Process exists. */
+  if (errno == EPERM) return 0;	/* Process exists but is not owned by us. */
+  return 1;			/* No such process, ESRCH. */
+}
+
+
+static int
+xscreensaver_systemd_loop (void)
+{
+  sd_bus *system_bus = NULL, *user_bus = NULL;
+  struct handler_ctx *ctx = &global_ctx;
+  sd_bus_error error = SD_BUS_ERROR_NULL;
+  int rc;
+  time_t last_deactivate_time = 0;
+
+  /* 'user_bus' is where we receive messages from other programs sending
+     inhibit/uninhibit to org.freedesktop.ScreenSaver, etc.
+   */
+
+  rc = sd_bus_open_user (&user_bus);
+  if (rc < 0) {
+    fprintf (stderr, "%s: user bus connection failed: %s\n",
+             blurb(), strerror(-rc));
+    goto FAIL;
+  }
+
+  rc = sd_bus_add_object_vtable (user_bus,
+                                 NULL,
+                                 DBUS_FDO_OBJECT_PATH,
+                                 DBUS_FDO_INTERFACE,
+                                 xscreensaver_dbus_vtable,
+                                 &global_ctx);
+  if (rc < 0) {
+    fprintf (stderr, "%s: vtable registration failed: %s\n",
+             blurb(), strerror(-rc));
+    goto FAIL;
+  }
+
+  rc = sd_bus_add_object_vtable (user_bus,
+                                 NULL,
+                                 DBUS_FDO_OBJECT_PATH_2,
+                                 DBUS_FDO_INTERFACE,
+                                 xscreensaver_dbus_vtable,
+                                 &global_ctx);
+  if (rc < 0) {
+    fprintf (stderr, "%s: vtable registration failed: %s\n",
+             blurb(), strerror(-rc));
+    goto FAIL;
+  }
+
+  rc = sd_bus_request_name (user_bus, DBUS_FDO_NAME, 0);
+  if (rc < 0) {
+    fprintf (stderr, "%s: failed to connect as %s: %s\n",
+             blurb(), DBUS_FDO_NAME, strerror(-rc));
+    goto FAIL;
+  }
+
+  rc = sd_bus_request_name (user_bus, DBUS_CLIENT_NAME, 0);
+  if (rc < 0) {
+    fprintf (stderr, "%s: failed to connect as %s: %s\n",
+             blurb(), DBUS_CLIENT_NAME, strerror(-rc));
+    goto FAIL;
+  }
+
+
+  /* 'system_bus' is where we hold a lock on org.freedesktop.login1, meaning
+     that the system will send us a PrepareForSleep message when the system is
+     about to suspend.
+  */
+
+  rc = sd_bus_open_system (&system_bus);
+  if (rc < 0) {
+    fprintf (stderr, "%s: system bus connection failed: %s\n",
+             blurb(), strerror(-rc));
+    goto FAIL;
+  }
+
+  /* Obtain a lock fd from the "Inhibit" method, so that we can delay
+     sleep when a "PrepareForSleep" signal is posted. */
+
+  ctx->system_bus = system_bus;
+  rc = xscreensaver_register_sleep_lock (ctx);
+  if (rc < 0)
+    goto FAIL;
+
+  /* This is basically an event mask, saying that we are interested in
+     "PrepareForSleep", and to run our callback when that signal is thrown.
+  */
+  rc = sd_bus_add_match (system_bus, NULL, DBUS_SD_MATCH,
+                         xscreensaver_systemd_handler,
+                         &global_ctx);
+  if (rc < 0) {
+    fprintf (stderr, "%s: add match failed: %s\n", blurb(), strerror(-rc));
+    goto FAIL;
+  }
+
+  if (verbose_p)
+    fprintf (stderr, "%s: connected\n", blurb());
+
+
+  /* Run an event loop forever, and wait for our callback to run.
+   */
+  while (1) {
+    struct pollfd fds[2];
+    uint64_t poll_timeout, system_timeout, user_timeout;
+    struct inhibit_entry *entry;
+
+    /* We MUST call sd_bus_process() on each bus at least once before calling
+       sd_bus_get_events(), so just always start the event loop by processing
+       all outstanding requests on both busses. */
+    do {
+      rc = sd_bus_process (system_bus, NULL);
+      if (rc < 0) {
+        fprintf (stderr, "%s: failed to process system bus: %s\n",
+                 blurb(), strerror(-rc));
+        goto FAIL;
+      }
+    } while (rc > 0);
+
+    do {
+      rc = sd_bus_process (user_bus, NULL);
+      if (rc < 0) {
+        fprintf (stderr, "%s: failed to process user bus: %s\n",
+                 blurb(), strerror(-rc));
+        goto FAIL;
+      }
+    } while (rc > 0);
+
+    fds[0].fd = sd_bus_get_fd (system_bus);
+    fds[0].events = sd_bus_get_events (system_bus);
+    fds[0].revents = 0;
+
+    fds[1].fd = sd_bus_get_fd (user_bus);
+    fds[1].events = sd_bus_get_events (user_bus);
+    fds[1].revents = 0;
+
+    sd_bus_get_timeout (system_bus, &system_timeout);
+    sd_bus_get_timeout (user_bus, &user_timeout);
+
+    if (system_timeout == 0 && user_timeout == 0)
+      poll_timeout = 0;
+    else if (system_timeout == UINT64_MAX && user_timeout == UINT64_MAX)
+      poll_timeout = -1;
+    else {
+      poll_timeout = (system_timeout < user_timeout
+                      ? system_timeout : user_timeout);
+      poll_timeout /= 1000000;
     }
-    ctx->bus = bus;
-
-    rc = sd_bus_call_method(bus,
-            "org.freedesktop.login1",
-            "/org/freedesktop/login1",
-            "org.freedesktop.login1.Manager",
-            "Inhibit",
-            &error,
-            &reply,
-            "ssss",
-            "sleep",
-            "xscreensaver",
-            "lock screen on suspend",
-            "delay");
-    if (rc < 0) {
-        warnx("Failed to call Inhibit(): %s", error.message);
-        goto out;
+
+    /* Prune any entries whose process has gone away: this happens if
+       a program inhibits, then exits without having called uninhibit.
+       That would have left us inhibited forever, even if the inhibiting
+       program was re-launched, since the new instance won't have the
+       same cookie. */
+    SLIST_FOREACH (entry, &inhibit_head, entries) {
+      if (entry->pid &&   /* Might not know this entry's pid, sigh... */
+          pid_dead (entry->pid)) {
+        if (verbose_p)
+          fprintf (stderr,
+                   "%s: pid %lu for inhibiting app \"%s\" has died:"
+                   " uninhibiting %08X\n",
+                   blurb(),
+                   (unsigned long) entry->pid,
+                   entry->appname,
+                   entry->cookie);
+        SLIST_REMOVE (&inhibit_head, entry, inhibit_entry, entries);
+        if (entry->appname) free (entry->appname);
+        free (entry);
+        ctx->is_inhibited--;
+        if (ctx->is_inhibited < 0)
+          ctx->is_inhibited = 0;
+      }
     }
-    /*
-     * Verify that the reply actually contains a lock fd.
+
+
+    /* We want to wake up at least once every N seconds to de-activate
+       the screensaver if we have been inhibited.
      */
-    rc = sd_bus_message_read(reply, "h", &fd);
-    if (rc < 0) {
-        warnx("Failed to read message: %s", strerror(-rc));
-        goto out;
-    }
-    assert(fd >= 0);
-    ctx->lock = reply;
+    if (poll_timeout > HEARTBEAT_INTERVAL * 1000)
+      poll_timeout = HEARTBEAT_INTERVAL * 1000;
 
-    rc = sd_bus_add_match(bus, &slot, match, handler, &global_ctx);
+    rc = poll (fds, 2, poll_timeout);
     if (rc < 0) {
-        warnx("Failed to add match: %s", strerror(-rc));
-        goto out;
+      fprintf (stderr, "%s: poll failed: %s\n", blurb(), strerror(-rc));
+      exit (EXIT_FAILURE);
     }
 
-    for (;;) {
-        rc = sd_bus_process(bus, NULL);
-        if (rc < 0) {
-            warnx("Failed to process bus: %s", strerror(-rc));
-            goto out;
-        }
-        if (rc > 0)
-            /* we processed a request, try to process another one, right-away */
-            continue;
-
-        /* Wait for the next request to process */
-        rc = sd_bus_wait(bus, (uint64_t) -1);
-        if (rc < 0) {
-            warnx("Failed to wait on bus: %s", strerror(-rc));
-            goto out;
+    if (ctx->is_inhibited) {
+      time_t now = time ((time_t *) 0);
+      if (now - last_deactivate_time >= HEARTBEAT_INTERVAL) {
+        if (verbose_p) {
+          SLIST_FOREACH (entry, &inhibit_head, entries) {
+            char ct[100];
+            ctime_r (&entry->start_time, ct);
+            fprintf (stderr, "%s: inhibited by \"%s\" since %s",
+                     blurb(), entry->appname, ct);
+          }
         }
+        xscreensaver_command ("deactivate");
+        last_deactivate_time = now;
+      }
+    }
+  }
+
+ FAIL:
+  if (system_bus)
+    sd_bus_flush_close_unref (system_bus);
+
+  if (user_bus)
+    sd_bus_flush_close_unref (user_bus);
+
+  sd_bus_error_free (&error);
+
+  return EXIT_FAILURE;
+}
+
+
+static char *usage = "\n\
+usage: %s [-verbose]\n\
+\n\
+This program is launched by the xscreensaver daemon to monitor DBus.\n\
+It invokes 'xscreensaver-command' to tell the xscreensaver daemon to lock\n\
+the screen before the system suspends, e.g., when a laptop's lid is closed.\n\
+\n\
+It also responds to certain messages sent by media players allowing them to\n\
+request that the screen not be blanked during playback.\n\
+\n\
+From XScreenSaver %s, (c) 1991-%s Jamie Zawinski <jwz@jwz.org>.\n";
+
+
+#define USAGE() do { \
+ fprintf (stderr, usage, progname, screensaver_version, year); exit (1); \
+ } while(0)
+
+
+int
+main (int argc, char **argv)
+{
+  int i;
+  char *s;
+  char year[5];
+
+  progname = argv[0];
+  s = strrchr (progname, '/');
+  if (s) progname = s+1;
+
+  screensaver_version = (char *) malloc (5);
+  memcpy (screensaver_version, screensaver_id + 17, 4);
+  screensaver_version [4] = 0;
+
+  s = strchr (screensaver_id, '-');
+  s = strrchr (s, '-');
+  s++;
+  strncpy (year, s, 4);
+  year[4] = 0;
+
+  for (i = 1; i < argc; i++)
+    {
+      const char *s = argv [i];
+      int L;
+      if (s[0] == '-' && s[1] == '-') s++;
+      L = strlen (s);
+      if (L < 2) USAGE ();
+      else if (!strncmp (s, "-verbose", L)) verbose_p = 1;
+      else if (!strncmp (s, "-quiet",   L)) verbose_p = 0;
+      else USAGE ();
     }
 
-out:
-    if (reply)
-        sd_bus_message_unref(reply);
-    if (slot)
-        sd_bus_slot_unref(slot);
-    if (bus)
-        sd_bus_flush_close_unref(bus);
-    if (user_bus)
-        sd_bus_flush_close_unref(user_bus);
-    sd_bus_error_free(&error);
-
-    return EXIT_FAILURE;
+# undef ya_rand_init
+  ya_rand_init (0);
+
+  exit (xscreensaver_systemd_loop());
 }
diff --git a/driver/xscreensaver-text b/driver/xscreensaver-text
index eca1fbf..4b69f49 100755
--- a/driver/xscreensaver-text
+++ b/driver/xscreensaver-text
@@ -1,5 +1,5 @@
 #!/usr/bin/perl -w
-# Copyright © 2005-2019 Jamie Zawinski <jwz@jwz.org>
+# Copyright © 2005-2020 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
@@ -37,7 +37,7 @@ use Text::Wrap qw(wrap);
 #use bytes;  # This breaks shit.
 
 my $progname = $0; $progname =~ s@.*/@@g;
-my ($version) = ('$Revision: 1.48 $' =~ m/\s(\d[.\d]+)\s/s);
+my ($version) = ('$Revision: 1.49 $' =~ m/\s(\d[.\d]+)\s/s);
 
 my $verbose = 0;
 my $http_proxy = undef;
@@ -529,8 +529,13 @@ sub reformat_html($$) {
   if (!defined($wrap_columns) || $wrap_columns > 0) {
     $Text::Wrap::columns = ($wrap_columns || 72);
     $Text::Wrap::break = '[\s/|]';  # wrap on slashes for URLs
-    $_ = wrap ("", "  ", $_);       # wrap the lines as a paragraph
-    s/[ \t]+$//gm;                  # lose whitespace at end of line again
+
+    # Text::Wrap sometimes dies with "This shouldn't happen" if columns
+    # is small, but not in any predictable way.
+    eval {
+      $_ = wrap ("", "  ", $_);     # wrap the lines as a paragraph
+      s/[ \t]+$//gm;                # lose whitespace at end of line again
+    };
   }
 
   s/^\n+//gs;
@@ -658,8 +663,13 @@ sub reformat_text($) {
     print STDERR "$progname: wrapping at $wrap_columns...\n" if ($verbose > 2);
     $Text::Wrap::columns = $wrap_columns;
     $Text::Wrap::break = '[\s/]';  # wrap on slashes for URLs
-    $body = wrap ("", "", $body);
-    $body =~ s/[ \t]+$//gm;
+
+    # Text::Wrap sometimes dies with "This shouldn't happen" if columns
+    # is small, but not in any predictable way.
+    eval {
+      $body = wrap ("", "", $body);
+      $body =~ s/[ \t]+$//gm;
+    };
   }
 
   if ($truncate_lines) {
@@ -842,13 +852,12 @@ sub main() {
     else { usage; }
   }
 
-  if ($load_p) {
-
-    if (!defined ($cocoa_id)) {
-      # see OSX/XScreenSaverView.m
-      $cocoa_id = $ENV{XSCREENSAVER_CLASSPATH};
-    }
+  if (!defined ($cocoa_id)) {
+    # see OSX/XScreenSaverView.m
+    $cocoa_id = $ENV{XSCREENSAVER_CLASSPATH};
+  }
 
+  if ($load_p) {
     if (defined ($cocoa_id)) {
       get_cocoa_prefs($cocoa_id);
     } else {
diff --git a/driver/xscreensaver.c b/driver/xscreensaver.c
index b9c54f1..ce39c87 100644
--- a/driver/xscreensaver.c
+++ b/driver/xscreensaver.c
@@ -10,81 +10,155 @@
  */
 
 /*   ========================================================================
+ *   HOW IT WORKS
+ *   ========================================================================
+ *
  *   First we wait until the keyboard and mouse become idle for the specified
- *   amount of time.  We do this in one of three different ways: periodically
- *   checking with the XIdle server extension; selecting key and mouse events
- *   on (nearly) all windows; or by waiting for the MIT-SCREEN-SAVER extension
- *   to send us a "you are idle" event.
+ *   amount of time.  Then, we map one or more full screen black windows.
  *
- *   Then, we map a full screen black window.
+ *   We hold grabs on our override-redirect windows to ensure that user input
+ *   does not leak through the screen saver to other applications on the 
+ *   desktop.  If we cannot secure those grabs, we do not blank the screen.
  *
- *   We place a __SWM_VROOT property on this window, so that newly-started
- *   clients will think that this window is a "virtual root" window (as per
- *   the logic in the historical "vroot.h" header.)
+ *   Creating those windows:
  *
- *   If there is an existing "virtual root" window (one that already had
- *   an __SWM_VROOT property) then we remove that property from that window.
- *   Otherwise, clients would see that window (the real virtual root) instead
- *   of ours (the impostor.)
+ *     - If there are multiple screens, in the X11 sense of "screen", we
+ *       create a window for each (the second number in the $DISPLAY
+ *       variable, "host:display.screen".)
  *
- *   Then we pick a random program to run, and start it.  Two assumptions 
- *   are made about this program: that it has been specified with whatever
- *   command-line options are necessary to make it run on the root window;
- *   and that it has been compiled with vroot.h, so that it is able to find
- *   the root window when a virtual-root window manager (or this program) is
- *   running.
+ *     - On Xinerama/RANDR systems, we create windows covering each physical
+ *       monitor, meaning multiple windows on the same virtual desktop.
  *
- *   Then, we wait for keyboard or mouse events to be generated on the window.
- *   When they are, we kill the inferior process, unmap the window, and restore
- *   the __SWM_VROOT property to the real virtual root window if there was one.
+ *   Then we pick a random program to run, and start it.  We assume that it
+ *   has been specified with whatever command line arguments are required to
+ *   make it render onto the window we have provided.  This is most easily
+ *   accomplished by simply including the late-2003 version of "vroot.h",
+ *   which will find the window via the $XSCREENSAVER_WINDOW environment
+ *   variable, or via the __SWM_VROOT property.
  *
- *   On multi-screen systems, we do the above on each screen, and start
- *   multiple programs, each with a different value of $DISPLAY.
+ *   Programs must draw onto the window provided.  Creating their own window
+ *   atop the xscreensaver window does not work.
  *
- *   On Xinerama systems, we do a similar thing, but instead create multiple
- *   windows on the (only) display, and tell the subprocess which one to use
- *   via the $XSCREENSAVER_WINDOW environment variable -- this trick requires
- *   a recent (Aug 2003) revision of vroot.h.
+ *   Then, we wait for keyboard or mouse events to be generated on our
+ *   windows.  When they are, we kill the inferior process, unmap the
+ *   windows, and restore the __SWM_VROOT property to the real virtual root
+ *   window if there was one.
  *
- *   (See comments in screens.c for more details about Xinerama/RANDR stuff.)
+ *   Do not ever kill XScreenSaver with signal 9 -- that can lead to the
+ *   __SWM_VROOT property not being restored, and that will screw up your
+ *   window manager.  Rather than "kill", use "xscreensaver-command -exit"
+ *   instead.
  *
  *   While we are waiting for user activity, we also set up timers so that,
  *   after a certain amount of time has passed, we can start a different
  *   screenhack.  We do this by killing the running child process with
  *   SIGTERM, and then starting a new one in the same way.
  *
- *   If there was a real virtual root, meaning that we removed the __SWM_VROOT
- *   property from it, meaning we must (absolutely must) restore it before we
- *   exit, then we set up signal handlers for most signals (SIGINT, SIGTERM,
- *   etc.) that do this.  Most Xlib and Xt routines are not reentrant, so it
- *   is not generally safe to call them from signal handlers; however, this
- *   program spends most of its time waiting, so the window of opportunity 
- *   when code could be called reentrantly is fairly small; and also, the worst
- *   that could happen is that the call would fail.  If we've gotten one of
- *   these signals, then we're on our way out anyway.  If we didn't restore the
- *   __SWM_VROOT property, that would be very bad, so it's worth a shot.  Note
- *   that this means that, if you're using a virtual-root window manager, you
- *   can really fuck up the world by killing this process with "kill -9".
- *
  *   This program accepts ClientMessages of type SCREENSAVER; these messages
- *   may contain the atoms ACTIVATE, DEACTIVATE, etc, meaning to turn the 
- *   screensaver on or off now, regardless of the idleness of the user,
- *   and a few other things.  The included "xscreensaver-command" program
- *   sends these messsages.
+ *   may contain the atoms ACTIVATE, DEACTIVATE, etc. The included
+ *   "xscreensaver-command" program sends these messsages.
+ *
+ *
+ *   ========================================================================
+ *   ABOUT SERVER EXTENSIONS
+ *   ========================================================================
+ *
+ *   Over the decades, there have been three X11 server extensions that are
+ *   applicable to screen saving:
+ *
+ *     - XIdle
+ *
+ *       This extension provided a function to poll the user's idle time.
+ *       It was simple and direct and worked great.  Therefore, it was
+ *       removed from the X11 distribution in 1994, with the release of
+ *       X11R6.  https://bugs.freedesktop.org/show_bug.cgi?id=1419
+ *
+ *     - SGI SCREEN_SAVER
+ *
+ *       This extension sent two new events: "user is idle", and "user
+ *       is no longer idle". It was simple and direct and worked great.
+ *       But as the name implies, it only ever worked on Silicon
+ *       Graphics machines.  SGI became irrelevant around 1998 and went
+ *       out of business in 2009.
+ *
+ *     - MIT-SCREEN-SAVER
+ *
+ *       This extension still exists, but it is useless to us.  It takes
+ *       the following approach:
+ *
+ *         - When the user is idle, immediately map full screen black
+ *           windows on each screen.
+ *
+ *         - Inform the screen saver client that the screen is now black.
+ *
+ *         - When user activity occurs, unmap the windows and then
+ *           inform the screen saver client.
+ *
+ *       The screen saver client can specify a few parameters of that
+ *       window, like visual and depth, but that's it.
+ *
+ *       The extension is designed with the assumption that a screen saver
+ *       would render onto the provided window.  However:
+ *
+ *         - OpenGL programs may require different visuals than 2D X11
+ *           programs, and you can't change the visual of a window after it
+ *           has been created.
+ *
+ *         - The extension maps one window per X11 "Screen", which, in this
+ *           modern world, tend to span the entire virtual desktop; whereas
+ *           XScreenSaver runs savers full screen on each *monitor* instead.
+ *           In other words, it is incompatible with Xinerama / RANDR.
+ *
+ *         - Since this extension maps its own full-screen black windows and
+ *           informs us of that after the fact, it prevents the "fade/unfade"
+ *           animations from working properly.
+ *
+ *         - Since it only tells us when the user is idle or non-idle, it
+ *           prevents the "hysteresis" option from working properly (where
+ *           we ignore tiny mouse motions).
+ *
+ *       In summary, it creates its windows too early, removes them too late,
+ *       creates windows of the wrong quantity and wrong shape, cannot create
+ *       them with the proper visuals, and delivers too little information
+ *       about what caused the user activity.
+ *
+ *       Also my experience was that the MIT-SCREEN-SAVER extension was flaky,
+ *       and using it at all led to frequent server crashes.
  *
- *   If we don't have the XIdle, MIT-SCREEN-SAVER, or SGI SCREEN_SAVER
- *   extensions, then we do the XAutoLock trick: notice every window that
- *   gets created, and wait 30 seconds or so until its creating process has
- *   settled down, and then select KeyPress events on those windows which
- *   already select for KeyPress events.  It's important that we not select
- *   KeyPress on windows which don't select them, because that would
- *   interfere with event propagation.  This will break if any program
- *   changes its event mask to contain KeyRelease or PointerMotion more than
- *   30 seconds after creating the window, but such programs do not seem to
- *   occur in nature (I've never seen it happen in all these years.)
+ *       So that's why, even if the server supports the MIT-SCREEN-SAVER
+ *       extension, we don't use it.
  *
- *   The reason that we can't select KeyPresses on windows that don't have
- *   them already is that, when dispatching a KeyPress event, X finds the
+ *       There is a recent trend among those who hack on video players to
+ *       say, "We inhibit blanking by calling XResetScreenSaver and/or
+ *       XScreenSaverSuspend, so our work here is done, fuck off."  This
+ *       betrays a willful ignorance of why the MIT-SCREEN-SAVER extension
+ *       is a useless foundation upon which to build a screen saver or
+ *       screen locker.
+ *
+ *       The proper way to inhibit blanking while video is playing is to
+ *       run "xscreensaver-command -deactivate" once a minute while the
+ *       video is playing, as has been explained in the XScreenSaver FAQ
+ *       for 3 decades: https://www.jwz.org/xscreensaver/faq.html#dvd
+ *
+ *       The reason to do it as a heartbeat is so that your video player
+ *       fails SAFE.  Should the player exit abnormally, or freeze, the
+ *       heartbeat stops coming, and screen blanking and locking can resume.
+ *
+ *
+ *   ========================================================================
+ *   WITHOUT SERVER EXTENSIONS
+ *   ========================================================================
+ *
+ *   So.  Having established that there no longer exist any server extensions
+ *   that help us in any way, here's how idle detection ACTUALLY works:
+ *
+ *   XScreenSaver notices every window that gets created, wait 30 seconds or
+ *   so until its birth pangs have settled down, and then select KeyPress
+ *   events on those windows.
+ *
+ *   Actually it only selects KeyPress events on windows that already selected
+ *   for their own KeyPress events, because to do otherwise would interfere
+ *   with event propagation.  When dispatching a KeyPress event, X finds the
  *   lowest (leafmost) window in the hierarchy on which *any* client selects
  *   for KeyPress, and sends the event to that window.  This means that if a
  *   client had a window with subwindows, and expected to receive KeyPress
@@ -94,7 +168,7 @@
  *   another client malfunction in this way.
  *
  *   But here's a new kink that started showing up in late 2014: GNOME programs
- *   don't actually select for or receive KeyPress events! They do it behind
+ *   don't actually select for or receive KeyPress events!  They do it behind
  *   the scenes through some kind of Input Method magic, even when running in
  *   an en_US locale.  However, in that case, those applications *do* seem to
  *   update the _NET_WM_USER_TIME on their own windows every time they have
@@ -103,44 +177,44 @@
  *
  *   To detect mouse motion, we periodically wake up and poll the mouse
  *   position and button/modifier state, and notice when something has
- *   changed.  We make this check every five seconds by default, and since the
- *   screensaver timeout has a granularity of one minute, this makes the
+ *   changed.  We make this check every five seconds by default, and since
+ *   the screensaver timeout has a granularity of one minute, this makes the
  *   chance of a false positive very small.  We could detect mouse motion in
  *   the same way as keyboard activity, but that would suffer from the same
  *   "client changing event mask" problem that the KeyPress events hack does.
- *   I think polling is more reliable.
+ *   Polling is more reliable.
+ *
+ *   Also, because cats, trucks and earthquakes are things that exist, we
+ *   ignore any mouse motions smaller than 10px by default.
  *
- *   On systems with /proc/interrupts (Linux) we poll that file and note when
+ *   On Linux systems with /proc/interrupts we poll that file and note when
  *   the interrupt counter numbers on the "keyboard" and "PS/2" lines change.
- *   (There is no reliable way, using /proc/interrupts, to detect non-PS/2
- *   mice, so it doesn't help for serial or USB mice.)
+ *   That was helpful for a decade or so, but then PS/2 devices went out of
+ *   fashion, and there is no reliable way, using /proc/interrupts, to detect
+ *   activity on USB keyboards or mice.  Oh well.
+ *
  *
- *   None of this crap happens if we're using one of the extensions.  Sadly,
- *   the XIdle extension hasn't been available for many years; the SGI
- *   extension only exists on SGIs; and the MIT extension, while widely
- *   deployed, is garbage in several ways.
+ *   ========================================================================
+ *   DEBUGGING HINTS
+ *   ========================================================================
  *
- *   A third idle-detection option could be implemented (but is not): when
- *   running on the console display ($DISPLAY is `localhost`:0) and we're on a
- *   machine where /dev/tty and /dev/mouse have reasonable last-modification
- *   times, we could just stat() those.  But the incremental benefit of
- *   implementing this is really small, so forget I said anything.
+ *     - Have a second terminal handy, e.g. a Ctrl-Alt-F1 console.  If you
+ *       are running xscreensaver under a debugger, it might be helpful to
+ *       run it from that other console, not from a terminal window within
+ *       the same X11 session.  That runs the risk of stopping at a
+ *       breakpoint while the screen is blanked and the keyboard is grabbed.
  *
- *   Debugging hints:
- *     - Have a second terminal handy.
- *     - Be careful where you set your breakpoints, you don't want this to
- *       stop under the debugger with the keyboard grabbed or the blackout
- *       window exposed.
- *     - If you run your debugger under XEmacs, try M-ESC (x-grab-keyboard)
- *       to keep your emacs window alive even when xscreensaver has grabbed.
  *     - Go read the code related to `debug_p'.
+ *
  *     - You probably can't set breakpoints in functions that are called on
  *       the other side of a call to fork() -- if your subprocesses are
- *       dying with signal 5, Trace/BPT Trap, you're losing in this way.
- *     - If you aren't using a server extension, don't leave this stopped
- *       under the debugger for very long, or the X input buffer will get
- *       huge because of the keypress events it's selecting for.  This can
- *       make your X server wedge with "no more input buffers."
+ *       dying with signal 5 Trace/BPT Trap, you're losing in this way.
+ *
+ *     - Don't leave this stopped under the debugger for very long, or the
+ *       X input buffer will get huge with un-read KeyPress events.  This
+ *       can make your X server hang with "no more input buffers."
+ *
+ *     - Writing a new screen saver?  See the README.hacking file.
  *
  * ======================================================================== */
 
@@ -418,10 +492,10 @@ saver_ehandler (Display *dpy, XErrorEvent *error)
    "#######################################################################\n"
    "\n"
    "    If at all possible, please re-run xscreensaver with the command\n"
-   "    line arguments `-sync -verbose -log log.txt', and reproduce this\n"
-   "    bug.  That will cause xscreensaver to dump a `core' file to the\n"
-   "    current directory.  Please include the stack trace from that core\n"
-   "    file in your bug report.  *DO NOT* mail the core file itself!  That\n"
+   "    line arguments \"-sync -log log.txt\", and reproduce this bug.\n"
+   "    That will cause xscreensaver to dump a `core' file to the current\n"
+   "    directory.  Please include the stack trace from that core file\n"
+   "    in your bug report.  *DO NOT* mail the core file itself!  That\n"
    "    won't work.  A \"log.txt\" file will also be written.  Please *do*\n"
    "    include the complete \"log.txt\" file with your bug report.\n"
    "\n"
@@ -1314,6 +1388,7 @@ main_loop (saver_info *si)
           p->dpms_enabled_p && 
           p->dpms_quickoff_p)
         {
+          /* Sync again just in case */
           sync_server_dpms_settings (si->dpy, True,
                                      p->dpms_quickoff_p,
                                      p->dpms_standby / 1000,
@@ -1431,6 +1506,24 @@ main_loop (saver_info *si)
                 si->cycle_id = 0;
                 cycle_timer ((XtPointer) si, 0);
               }
+
+            /* If we are blanking only, optionally power down monitor
+               right now: quickoff means power down monitor again as soon
+               as unlock dialog is dismissed without unlocking. */
+            if (!ok_to_unblank &&
+                p->mode == BLANK_ONLY &&
+                p->dpms_enabled_p && 
+                p->dpms_quickoff_p)
+              {
+                /* Sync again just in case */
+                sync_server_dpms_settings (si->dpy, True,
+                                           p->dpms_quickoff_p,
+                                           p->dpms_standby / 1000,
+                                           p->dpms_suspend / 1000,
+                                           p->dpms_off / 1000,
+                                           False);
+                monitor_power_on (si, False);
+              }
 	  }
 #endif /* !NO_LOCKING */
 
@@ -1496,6 +1589,7 @@ main (int argc, char **argv)
   saver_info *si = &the_si;
   saver_preferences *p = &si->prefs;
   struct passwd *spasswd;
+  Bool inhibit_stderr_capture_p = False;
   int i;
 
   /* It turns out that if we do setlocale (LC_ALL, "") here, people
@@ -1554,10 +1648,14 @@ main (int argc, char **argv)
 
   shell = connect_to_server (si, &argc, argv);
   process_command_line (si, &argc, argv);
-  stderr_log_file (si);
+  inhibit_stderr_capture_p = stderr_log_file (si);
   print_banner (si);
 
   load_init_file(si->dpy, p); /* must be before initialize_per_screen_info() */
+
+  if (inhibit_stderr_capture_p && !p->verbose_p)
+    p->verbose_p = 1;  /* "-log" implies "-verbose -no-capture-stderr" */
+
   blurb_timestamp_p = p->timestamp_p;  /* kludge */
   initialize_per_screen_info (si, shell); /* also sets si->fading_possible_p */
 
@@ -1601,13 +1699,18 @@ main (int argc, char **argv)
                              p->dpms_off / 1000,
                              False);
 
-  initialize_stderr (si);
+  initialize_stderr (si, inhibit_stderr_capture_p);
   handle_signals (si);
 
   store_saver_status (si);	/* for xscreensaver-command -status */
 
 # ifdef HAVE_LIBSYSTEMD   /* Launch it in the background */
-  si->systemd_pid = fork_and_exec_1 (si, 0, "xscreensaver-systemd");
+  {
+    const char *cmd = (p->verbose_p
+                       ? "xscreensaver-systemd -verbose"
+                       : "xscreensaver-systemd");
+    si->systemd_pid = fork_and_exec_1 (si, 0, cmd);
+  }
 # endif
 
   make_splash_dialog (si);
@@ -1691,7 +1794,7 @@ XGetAtomName_safe (Display *dpy, Atom atom)
 }
 
 
-static void
+void
 clientmessage_response (saver_info *si, Window w, Bool error,
 			const char *stderr_msg,
 			const char *protocol_msg)
diff --git a/driver/xscreensaver.h b/driver/xscreensaver.h
index fe84d20..9bd2e3d 100644
--- a/driver/xscreensaver.h
+++ b/driver/xscreensaver.h
@@ -1,4 +1,4 @@
-/* xscreensaver, Copyright (c) 1993-2019 Jamie Zawinski <jwz@jwz.org>
+/* xscreensaver, Copyright (c) 1993-2020 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
@@ -141,6 +141,10 @@ extern void schedule_wakeup_event (saver_info *si, Time when, Bool verbose_p);
 
 extern Bool handle_clientmessage (saver_info *, XEvent *, Bool);
 extern void maybe_reload_init_file (saver_info *);
+extern void clientmessage_response (saver_info *, Window, Bool error,
+                                    const char *stderr_msg,
+                                    const char *protocol_msg);
+
 
 /* =======================================================================
    subprocs
@@ -176,8 +180,8 @@ extern const char *signal_name (int signal);
 
 extern FILE *real_stderr;
 extern FILE *real_stdout;
-extern void stderr_log_file (saver_info *si);
-extern void initialize_stderr (saver_info *si);
+extern Bool stderr_log_file (saver_info *si);
+extern void initialize_stderr (saver_info *si, Bool inhibit_p);
 extern void reset_stderr (saver_screen_info *ssi);
 extern void clear_stderr (saver_screen_info *ssi);
 extern void shutdown_stderr (saver_info *si);
diff --git a/driver/xscreensaver.man b/driver/xscreensaver.man
index 0679ff4..3b599fb 100644
--- a/driver/xscreensaver.man
+++ b/driver/xscreensaver.man
@@ -201,8 +201,10 @@ or possibly
 .EX
 sudo dpkg -P gnome-screensaver
 .EE
+Be careful that it doesn't try to uninstall all of GNOME.
 .TP 3
 \fB2: Launch xscreensaver at login.\fP
+
 Select "\fIStartup Applications\fP" from the menu (or manually
 launch "\fIgnome-session-properties\fP") and add "\fIxscreensaver\fP".
 
@@ -222,11 +224,18 @@ Keep reinventing that wheel, guys!  (If you have figured out how to
 replace Unity's locking "feature" with xscreensaver, let me know.)
 .TP 3
 \fB4: Turn off Unity's built-in blanking.\fP
+
 Open "\fISystem Settings / Brightness & Lock\fP";
 .br
 Un-check "\fIStart Automatically\fP";
 .br
 Set \fI"Turn screen off when inactive for"\fP to \fI"Never".\fP
+.br
+Or possibly that has been randomly renamed again:
+.br
+Set "\fISettings / Power / Power Settings\fP" to \fI"Never".\fP
+.TP 3
+\fB5: Log out and back in again.
 .SH USING KDE
 Like GNOME, KDE also decided to invent their own screen saver framework
 from scratch instead of simply using xscreensaver.  To replace the KDE
@@ -303,6 +312,7 @@ containing:
 Description=XScreenSaver
 [Service]
 ExecStart=/usr/bin/xscreensaver
+Restart=always
 [Install]
 WantedBy=default.target
 .EE
@@ -1027,7 +1037,7 @@ and a FAQ can always be found at https://www.jwz.org/xscreensaver/
 .BR xscreensaver\-getimage (1),
 .BR xscreensaver\-text (1).
 .SH COPYRIGHT
-Copyright \(co 1991-2019 by Jamie Zawinski.
+Copyright \(co 1991-2020 by 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 the above copyright notice appear in all copies and that
diff --git a/driver/xset.c b/driver/xset.c
index a381429..afb4438 100644
--- a/driver/xset.c
+++ b/driver/xset.c
@@ -35,7 +35,9 @@ ERROR!  You must not include vroot.h in this file.
 #endif
 
 
-/* MIT SCREEN-SAVER server extension hackery.
+/* MIT SCREEN-SAVER server extension.
+ * See the very long comment at the top of xscreensaver.c for why the
+ * MIT-SCREEN-SAVER extension is garbage and should not be used.
  */
 
 #ifdef HAVE_MIT_SAVER_EXTENSION
author	Simon Rettberg	2022-01-20 13:33:11 +0100
committer	Simon Rettberg	2022-01-20 13:33:11 +0100
commit	3d748ebe7d900e96670ff3d455896998dfba6191 (patch)
tree	e8bbaf6531897a2292da2158a46e9dce3df96baf /driver
parent	Re-sync dpms settings on unblank (diff)
download	xscreensaver-29r1.tar.gz xscreensaver-29r1.tar.xz xscreensaver-29r1.zip