From 427ef6c2d6092caf14630b1c81dae25dc3a27de4 Mon Sep 17 00:00:00 2001 From: Bradford Hovinen Date: Sat, 27 Jan 2001 17:14:59 +0000 Subject: [PATCH] Disable wallpaper in new_prefs structure, not structure passed to function 2001-01-27 Bradford Hovinen * capplets/new-background-properties/applier.c (applier_apply_prefs): Disable wallpaper in new_prefs structure, not structure passed to function 2001-01-26 Bradford Hovinen * capplets/new-background-properties/main.c (do_restore_from_defaults): Implement. Creates a preferences object with factory defaults and saves and applies those changes. --- ChangeLog | 12 ++++++++++++ capplets/background/applier.c | 2 +- capplets/background/main.c | 12 ++++++++++++ 3 files changed, 25 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 959546f71..60a9e2d9f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2001-01-27 Bradford Hovinen + + * capplets/new-background-properties/applier.c + (applier_apply_prefs): Disable wallpaper in new_prefs structure, + not structure passed to function + +2001-01-26 Bradford Hovinen + + * capplets/new-background-properties/main.c + (do_restore_from_defaults): Implement. Creates a preferences + object with factory defaults and saves and applies those changes. + 2001-01-26 Marius Andreiana * *.desktop, *.directory : Added ro (Romanian) translation diff --git a/capplets/background/applier.c b/capplets/background/applier.c index 7527828fc..f87bbaafe 100644 --- a/capplets/background/applier.c +++ b/capplets/background/applier.c @@ -352,7 +352,7 @@ applier_apply_prefs (Applier *applier, Preferences *prefs, #warning FIXME: should be a dialog g_warning (_("Could not load pixbuf \"%s\"; disabling wallpaper."), prefs->wallpaper_filename); - prefs->wallpaper_enabled = FALSE; + new_prefs->wallpaper_enabled = FALSE; } } diff --git a/capplets/background/main.c b/capplets/background/main.c index 3d7193390..b58c7aadd 100644 --- a/capplets/background/main.c +++ b/capplets/background/main.c @@ -144,6 +144,14 @@ do_set_xml (void) } } +static void +do_restore_from_defaults (void) +{ + prefs = PREFERENCES (preferences_new ()); + preferences_save (prefs); + preferences_apply_now (prefs); +} + int main (int argc, char **argv) { @@ -171,6 +179,10 @@ main (int argc, char **argv) do_set_xml (); return 0; } + else if (res == 5) { + do_restore_from_defaults (); + return 0; + } client = gnome_master_client (); flags = gnome_client_get_flags (client);