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
This commit is contained in:
Rodney Dawes 2007-01-08 16:26:48 +00:00 committed by Rodney Dawes
parent 90ff49c0f7
commit 410f1ee2b8
2 changed files with 9 additions and 1 deletions

View file

@ -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),

View file

@ -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 {