applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Backed out the last commit

Browse source
This commit is contained in:
Bradford Hovinen (Gdict maintainer) 2001-07-27 22:00:22 +00:00
parent 46547d1812
commit 9137adbe17
4 changed files with 2 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
capplets/background/ChangeLog
View file

@ -1,21 +1,3 @@
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?
2001-07-27 Bradford Hovinen <hovinen@ximian.com> 2001-07-27 Bradford Hovinen <hovinen@ximian.com>
* background-properties-capplet.c (get_legacy_settings): Fix * background-properties-capplet.c (get_legacy_settings): Fix

5
capplets/background/applier.c
View file

@ -315,8 +315,7 @@ applier_apply_prefs (Applier *applier, Preferences *prefs,
} }
if (!prefs->enabled) { if (!prefs->enabled) {
if (do_preview) draw_disabled_message (applier_get_preview_widget (applier));
draw_disabled_message (applier_get_preview_widget (applier));
return; return;
} }
@ -1387,7 +1386,7 @@ output_compat_prefs (Preferences *prefs)
gchar *color; gchar *color;
gnome_config_pop_prefix (); 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", gnome_config_set_string ("/Background/Default/wallpaper",
(prefs->wallpaper_filename) ? prefs->wallpaper_filename : "none"); (prefs->wallpaper_filename) ? prefs->wallpaper_filename : "none");
gnome_config_set_int ("/Background/Default/wallpaperAlign", prefs->wallpaper_type); gnome_config_set_int ("/Background/Default/wallpaperAlign", prefs->wallpaper_type);

1
capplets/background/background-properties-capplet.c
View file

@ -150,7 +150,6 @@ get_legacy_settings (Bonobo_ConfigDatabase db)
gchar *val_string, *val_filename; gchar *val_string, *val_filename;
int val_ulong, val_long; 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 (filename, "/main/wallpaper_filename", string, "/Background/Default/wallpaper=none");
COPY_FROM_LEGACY (ulong, "/main/wallpaper_type", int, "/Background/Default/wallpaperAlign=0"); COPY_FROM_LEGACY (ulong, "/main/wallpaper_type", int, "/Background/Default/wallpaperAlign=0");
copy_color_from_legacy (db, "/main/color1", "/Background/Default/color1"); copy_color_from_legacy (db, "/main/color1", "/Background/Default/color1");

1
capplets/background/preferences.c
View file

@ -256,7 +256,6 @@ preferences_new_from_bonobo_db (Bonobo_ConfigDatabase db, CORBA_Environment *ev)
prefs = PREFERENCES (preferences_new ()); prefs = PREFERENCES (preferences_new ());
prefs->enabled = bonobo_config_get_boolean (db, "/main/enabled", NULL);
prefs->orientation = bonobo_config_get_ulong (db, "/main/orientation", NULL); prefs->orientation = bonobo_config_get_ulong (db, "/main/orientation", NULL);
if (prefs->orientation != ORIENTATION_SOLID) if (prefs->orientation != ORIENTATION_SOLID)