Only draw disabled message if do_preview. Actually, the user will never

2001-07-27  Richard Hestilow  <hestilow@ximian.com>

	* applier.c (applier_apply_prefs): Only draw disabled message
	if do_preview. Actually, the user will never see this because
	the correct behavior (which is done) is to assume if they're
	running capplet, prefs->enable should be TRUE. This is because
	we are only honoring enable as a hacker-only setting.
	(output_compat_prefs): Output the correct "Enable" setting.

	* background-properties-capplet.c (get_legacy_settings): Support
	the "Enabled" flag.

	* preferences.c (preferences_new_from_bonobo_db): Import the
	"enabled" flag. Note that this is not bothered with in the _pbag
	function, because that's from the Proxy settings, which is only
	used for the GUI capplet, which always sets enabled to True, because
	this is a hacker-only option. Got it?
This commit is contained in:
Richard Hestilow 2001-07-27 19:34:55 +00:00 committed by Rachel Hestilow
parent 2d9be3eb4e
commit 4a76138680
4 changed files with 23 additions and 2 deletions

View file

@ -150,6 +150,7 @@ get_legacy_settings (Bonobo_ConfigDatabase db)
gchar *val_string, *val_filename;
int val_ulong, val_long;
COPY_FROM_LEGACY (boolean, "/main/enabled", bool, "/Background/Default/Enabled=true");
COPY_FROM_LEGACY (filename, "/main/wallpaper_filename", string, "/Background/Default/wallpaper=none");
COPY_FROM_LEGACY (ulong, "/main/wallpaper_type", int, "/Background/Default/wallpaperAlign=0");
copy_color_from_legacy (db, "/main/color1", "/Background/Default/color1");