243458d
--- nautilus-2.22.1/libbackground/preferences.c.hide-white-screen	2008-03-31 10:37:43.000000000 -0400
243458d
+++ nautilus-2.22.1/libbackground/preferences.c	2008-03-31 10:39:27.000000000 -0400
243458d
@@ -252,6 +252,26 @@ bg_preferences_load (BGPreferences *pref
243458d
 		else
243458d
 			prefs->wallpaper_filename = g_filename_from_utf8 (tmp, -1, NULL,
243458d
 									  NULL, NULL);
243458d
+
243458d
+		if (!g_file_test (prefs->wallpaper_filename, G_FILE_TEST_EXISTS)) {
243458d
+			GConfValue *default_value;
243458d
+			default_value = gconf_client_get_default_from_schema (client,
243458d
+									      BG_PREFERENCES_DRAW_BACKGROUND, NULL);
243458d
+			if (default_value != NULL) {
243458d
+				prefs->enabled = gconf_value_get_bool (default_value);
243458d
+				gconf_value_free (default_value);
243458d
+
243458d
+				g_free (prefs->wallpaper_filename);
243458d
+				prefs->wallpaper_filename = NULL;
243458d
+
243458d
+				default_value = gconf_client_get_default_from_schema (client,
243458d
+										      BG_PREFERENCES_PICTURE_FILENAME, NULL);
243458d
+				if (default_value != NULL) {
243458d
+					prefs->wallpaper_filename = g_strdup (gconf_value_get_string (default_value));
243458d
+					gconf_value_free (default_value);
243458d
+				}
243458d
+			}
243458d
+		}
243458d
 	}
243458d
 	g_free (tmp);
243458d