From 410f1ee2b83a2319c2567da5648f3260060a634f Mon Sep 17 00:00:00 2001 From: Rodney Dawes Date: Mon, 8 Jan 2007 16:26:48 +0000 Subject: Set prefs->enabled not prefs->wallpaper_enabled Patch from Jean-Christophe 2007-01-08 Rodney Dawes * 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 --- libbackground/ChangeLog | 8 ++++++++ libbackground/preferences.c | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) (limited to 'libbackground') 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 + + * 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 * 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 { -- cgit v1.2.1