diff options
| author | Alexander Larsson <alexl@redhat.com> | 2005-12-06 13:50:18 +0000 |
|---|---|---|
| committer | Alexander Larsson <alexl@src.gnome.org> | 2005-12-06 13:50:18 +0000 |
| commit | 9ee7427cb99ebbccc00934d7d440ebfc9036247e (patch) | |
| tree | 31e36f319f41cdf1d5fc7c3bfecde32ce1b4d084 | |
| parent | 52f36c58a4239734f37896add81b10db9c13938d (diff) | |
| download | gnome-control-center-nautilus-search2.tar.gz | |
Merge in changes from NAUTILUS_2_12_1 to NAUTILUS_SEARCH2_MERGE_ANCHOR1NAUTILUS_SEARCH2_MERGE_POINT2nautilus-search2
2005-12-06 Alexander Larsson <alexl@redhat.com>
Merge in changes from NAUTILUS_2_12_1 to
NAUTILUS_SEARCH2_MERGE_ANCHOR1 (on HEAD).
(This is NAUTILUS_SEARCH2_MERGE_POINT1)
| -rw-r--r-- | libbackground/ChangeLog | 7 | ||||
| -rw-r--r-- | libbackground/preferences.c | 14 |
2 files changed, 15 insertions, 6 deletions
diff --git a/libbackground/ChangeLog b/libbackground/ChangeLog index 049a09199..caa0ea84a 100644 --- a/libbackground/ChangeLog +++ b/libbackground/ChangeLog @@ -1,3 +1,10 @@ +2005-11-07 Alexis Robert <alexis@linuxcode.eu.org> + + Fixes #320647 + + * libbackground/preferences.c (bg_preferences_load): only use strings + returned from GConf when not NULL. + 2005-10-01 Rodney Dawes <dobey@novell.com> * preferences.c (bg_preferences_load, bg_preferences_merge_entry): diff --git a/libbackground/preferences.c b/libbackground/preferences.c index a2a1c451e..e0c0519a0 100644 --- a/libbackground/preferences.c +++ b/libbackground/preferences.c @@ -245,12 +245,14 @@ bg_preferences_load (BGPreferences *prefs) prefs->enabled = gconf_client_get_bool (client, BG_PREFERENCES_DRAW_BACKGROUND, &error); tmp = gconf_client_get_string (client, BG_PREFERENCES_PICTURE_FILENAME, &error); - if (g_utf8_validate (tmp, -1, NULL) && - g_file_test (tmp, G_FILE_TEST_EXISTS)) - prefs->wallpaper_filename = g_strdup (tmp); - else - prefs->wallpaper_filename = g_filename_from_utf8 (tmp, -1, NULL, - NULL, NULL); + if (tmp) { + if (g_utf8_validate (tmp, -1, NULL) && + g_file_test (tmp, G_FILE_TEST_EXISTS)) + prefs->wallpaper_filename = g_strdup (tmp); + else + prefs->wallpaper_filename = g_filename_from_utf8 (tmp, -1, NULL, + NULL, NULL); + } g_free (tmp); if (prefs->color1 != NULL) |