From 3e7140488f04564130227c96a639b5320fa00ac9 Mon Sep 17 00:00:00 2001 From: Bradford Hovinen Date: Thu, 10 Jan 2002 19:45:08 +0000 Subject: [PATCH] Courtesy of Jean Schurger : Make sure the 2002-01-10 Bradford Hovinen Courtesy of Jean Schurger : * preferences.c (bg_preferences_merge_entry): Make sure the wallpaper filename is non-NULL before doing anything with it --- libbackground/ChangeLog | 6 ++++++ libbackground/preferences.c | 1 + 2 files changed, 7 insertions(+) diff --git a/libbackground/ChangeLog b/libbackground/ChangeLog index 63ed0bdad..a0c4a3117 100644 --- a/libbackground/ChangeLog +++ b/libbackground/ChangeLog @@ -1,3 +1,9 @@ +2002-01-10 Bradford Hovinen + + Courtesy of Jean Schurger : + * preferences.c (bg_preferences_merge_entry): Make sure the + wallpaper filename is non-NULL before doing anything with it + 2001-12-20 Bradford Hovinen * applier.c (bg_applier_apply_prefs): Disable the wallpaper if we diff --git a/libbackground/preferences.c b/libbackground/preferences.c index 0bc396168..a945e046d 100644 --- a/libbackground/preferences.c +++ b/libbackground/preferences.c @@ -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;