diff options
author | Rodney Dawes <dobey@novell.com> | 2007-01-08 16:26:48 +0000 |
---|---|---|
committer | Rodney Dawes <dobey@src.gnome.org> | 2007-01-08 16:26:48 +0000 |
commit | 410f1ee2b83a2319c2567da5648f3260060a634f (patch) | |
tree | 6ac42d6219937283c06e0d01c9898eab6cbddc13 /libbackground | |
parent | 90ff49c0f7ae065661c594ad592b06262383f8c1 (diff) | |
download | gnome-control-center-410f1ee2b83a2319c2567da5648f3260060a634f.tar.gz |
Set prefs->enabled not prefs->wallpaper_enabled Patch from Jean-Christophe
2007-01-08 Rodney Dawes <dobey@novell.com>
* preferences.c (bg_preferences_merge_entry):
Set prefs->enabled not prefs->wallpaper_enabled
Patch from Jean-Christophe Jaskula
Fixes #339404
svn path=/trunk/; revision=7096
Diffstat (limited to 'libbackground')
-rw-r--r-- | libbackground/ChangeLog | 8 | ||||
-rw-r--r-- | libbackground/preferences.c | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/libbackground/ChangeLog b/libbackground/ChangeLog index 93dc2e601..fa6ab9e6f 100644 --- a/libbackground/ChangeLog +++ b/libbackground/ChangeLog @@ -1,3 +1,11 @@ +2007-01-08 Rodney Dawes <dobey@novell.com> + + * preferences.c (bg_preferences_merge_entry): + Set prefs->enabled not prefs->wallpaper_enabled + Patch from Jean-Christophe Jaskula + + Fixes #339404 + 2006-08-23 Kjartan Maraas <kmaraas@gnome.org> * preferences.c: (bg_preferences_load), diff --git a/libbackground/preferences.c b/libbackground/preferences.c index 864f6e5c4..9090657f0 100644 --- a/libbackground/preferences.c +++ b/libbackground/preferences.c @@ -367,7 +367,7 @@ bg_preferences_merge_entry (BGPreferences *prefs, (prefs->wallpaper_filename != NULL) && strcmp (prefs->wallpaper_filename, "") != 0 && strcmp (prefs->wallpaper_filename, "(none)") != 0) - prefs->wallpaper_enabled = TRUE; + prefs->enabled = TRUE; else prefs->enabled = FALSE; } else { |