X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=driver%2Fprefs.c;h=857139350ae4e2687d87d7e4c27a479cb87f6db8;hp=1df877287d621930caa45930428a48f05825dae8;hb=5f9c47ca98dd43d8f59b7c27d3fde6edfde4fe21;hpb=50be9bb40dc60130c99ffa568e6677779904ff70

diff --git a/driver/prefs.c b/driver/prefs.c
index 1df87728..85713935 100644
--- a/driver/prefs.c
+++ b/driver/prefs.c
@@ -1,5 +1,5 @@
 /* dotfile.c --- management of the ~/.xscreensaver file.
- * xscreensaver, Copyright (c) 1998-2008 Jamie Zawinski <jwz@jwz.org>
+ * xscreensaver, Copyright (c) 1998-2011 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
@@ -297,9 +297,9 @@ static const char * const prefs[] = {
   "pointerHysteresis",
   "windowCreationTimeout",
   "initialDelay",
-  "sgiSaverExtension",
+  "sgiSaverExtension",		/* not saved -- obsolete */
   "mitSaverExtension",		/* not saved -- obsolete */
-  "xidleExtension",
+  "xidleExtension",		/* not saved -- obsolete */
   "GetViewPortIsFullOfLies",
   "procInterrupts",
   "xinputExtensionDev",
@@ -851,9 +851,9 @@ write_init_file (Display *dpy,
       CHECK("pointerHysteresis")type = pref_int,  i = p->pointer_hysteresis;
       CHECK("windowCreationTimeout")type=pref_time,t= p->notice_events_timeout;
       CHECK("initialDelay")	type = pref_time, t = p->initial_delay;
-      CHECK("sgiSaverExtension")type = pref_bool, b=p->use_sgi_saver_extension;
+      CHECK("sgiSaverExtension") continue;  /* don't save */
       CHECK("mitSaverExtension") continue;  /* don't save */
-      CHECK("xidleExtension")	type = pref_bool, b = p->use_xidle_extension;
+      CHECK("xidleExtension")	 continue;  /* don't save */
       CHECK("procInterrupts")	type = pref_bool, b = p->use_proc_interrupts;
       CHECK("xinputExtensionDev") type = pref_bool, b = p->use_xinput_extension;
       CHECK("GetViewPortIsFullOfLies")  type = pref_bool,
@@ -861,7 +861,7 @@ write_init_file (Display *dpy,
       CHECK("overlayStderr")	type = pref_bool, b = overlay_stderr_p;
       CHECK("overlayTextBackground") continue;  /* don't save */
       CHECK("overlayTextForeground") continue;  /* don't save */
-      CHECK("bourneShell")	continue;
+      CHECK("bourneShell")	     continue;  /* don't save */
       else			abort();
 # undef CHECK
 
@@ -1118,17 +1118,20 @@ load_init_file (Display *dpy, saver_preferences *p)
   }
 
   p->use_xidle_extension = get_boolean_resource (dpy, "xidleExtension","Boolean");
-#if 0 /* ignore this, it is evil. */
-  p->use_mit_saver_extension = get_boolean_resource (dpy, 
-                                                     "mitSaverExtension",
-						     "Boolean");
-#endif
+#if 0 /* obsolete. */
   p->use_sgi_saver_extension = get_boolean_resource (dpy,
                                                      "sgiSaverExtension",
 						     "Boolean");
-
+#endif
+#if 0 /* obsolete. */
   p->use_xinput_extension = get_boolean_resource (dpy, "xinputExtensionDev",
                                                   "Boolean");
+#endif
+#if 0 /* broken and evil. */
+  p->use_mit_saver_extension = get_boolean_resource (dpy, 
+                                                     "mitSaverExtension",
+						     "Boolean");
+#endif
 
   p->use_proc_interrupts = get_boolean_resource (dpy,
                                                  "procInterrupts", "Boolean");