diff --git a/capplets/background/ChangeLog b/capplets/background/ChangeLog index 9c52db2c1..25090c74d 100644 --- a/capplets/background/ChangeLog +++ b/capplets/background/ChangeLog @@ -1,21 +1,3 @@ -2001-07-27 Richard Hestilow - - * 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? - 2001-07-27 Bradford Hovinen * background-properties-capplet.c (get_legacy_settings): Fix diff --git a/capplets/background/applier.c b/capplets/background/applier.c index a45ee908b..74d12fa9a 100644 --- a/capplets/background/applier.c +++ b/capplets/background/applier.c @@ -315,8 +315,7 @@ applier_apply_prefs (Applier *applier, Preferences *prefs, } if (!prefs->enabled) { - if (do_preview) - draw_disabled_message (applier_get_preview_widget (applier)); + draw_disabled_message (applier_get_preview_widget (applier)); return; } @@ -1387,7 +1386,7 @@ output_compat_prefs (Preferences *prefs) gchar *color; gnome_config_pop_prefix (); - gnome_config_set_bool ("/Background/Default/Enabled", prefs->enabled); + gnome_config_set_bool ("/Background/Default/Enabled", prefs->wallpaper_enabled); gnome_config_set_string ("/Background/Default/wallpaper", (prefs->wallpaper_filename) ? prefs->wallpaper_filename : "none"); gnome_config_set_int ("/Background/Default/wallpaperAlign", prefs->wallpaper_type); diff --git a/capplets/background/background-properties-capplet.c b/capplets/background/background-properties-capplet.c index c9e08bbec..86f5da6cf 100644 --- a/capplets/background/background-properties-capplet.c +++ b/capplets/background/background-properties-capplet.c @@ -150,7 +150,6 @@ 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"); diff --git a/capplets/background/preferences.c b/capplets/background/preferences.c index 3e53a5c95..948c42f78 100644 --- a/capplets/background/preferences.c +++ b/capplets/background/preferences.c @@ -256,7 +256,6 @@ preferences_new_from_bonobo_db (Bonobo_ConfigDatabase db, CORBA_Environment *ev) prefs = PREFERENCES (preferences_new ()); - prefs->enabled = bonobo_config_get_boolean (db, "/main/enabled", NULL); prefs->orientation = bonobo_config_get_ulong (db, "/main/orientation", NULL); if (prefs->orientation != ORIENTATION_SOLID)