Courtesy of Jean Schurger <jschurger@schurger.org>: Make sure the

2002-01-10  Bradford Hovinen  <hovinen@ximian.com>

	Courtesy of Jean Schurger <jschurger@schurger.org>:
	* preferences.c (bg_preferences_merge_entry): Make sure the
	wallpaper filename is non-NULL before doing anything with it
This commit is contained in:
Bradford Hovinen 2002-01-10 19:45:08 +00:00 committed by Bradford Hovinen (Gdict maintainer)
parent 936151c14f
commit 3e7140488f
2 changed files with 7 additions and 0 deletions

View file

@ -240,6 +240,7 @@ bg_preferences_merge_entry (BGPreferences *prefs,
}
else if (!strcmp (entry->key, "/desktop/gnome/background/wallpaper-enabled")) {
if (gconf_value_get_bool (value) &&
(prefs->wallpaper_filename != NULL) &&
strcmp (prefs->wallpaper_filename, "") != 0 &&
strcmp (prefs->wallpaper_filename, "(none)") != 0)
prefs->wallpaper_enabled = TRUE;