From 5ed22b4a3a1e2d25ccd0920ffefbe1a7d0a8ed44 Mon Sep 17 00:00:00 2001 From: Jens Granseuer Date: Tue, 9 Oct 2007 18:58:38 +0000 Subject: [PATCH] fix crash if we fail to convert a filename to UTF-8 2007-10-09 Jens Granseuer * appearance-desktop.c: (wp_props_wp_set): fix crash if we fail to convert a filename to UTF-8 svn path=/trunk/; revision=8164 --- capplets/appearance/ChangeLog | 5 +++++ capplets/appearance/appearance-desktop.c | 8 ++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/capplets/appearance/ChangeLog b/capplets/appearance/ChangeLog index 357f66610..bc6902966 100644 --- a/capplets/appearance/ChangeLog +++ b/capplets/appearance/ChangeLog @@ -1,3 +1,8 @@ +2007-10-09 Jens Granseuer + + * appearance-desktop.c: (wp_props_wp_set): fix crash if we fail to + convert a filename to UTF-8 + 2007-09-28 Jens Granseuer * appearance-themes.c: (theme_store_sort_func): make theme sorting diff --git a/capplets/appearance/appearance-desktop.c b/capplets/appearance/appearance-desktop.c index 4ecb5edb2..aff8cba47 100644 --- a/capplets/appearance/appearance-desktop.c +++ b/capplets/appearance/appearance-desktop.c @@ -600,8 +600,12 @@ wp_props_wp_set (AppearanceData *data, GnomeWPItem *item) else uri = g_filename_to_utf8 (item->filename, -1, NULL, NULL, NULL); - gconf_change_set_set_string (cs, WP_FILE_KEY, uri); - g_free (uri); + if (uri == NULL) { + g_warning ("Failed to convert filename to UTF-8: %s\n", item->filename); + } else { + gconf_change_set_set_string (cs, WP_FILE_KEY, uri); + g_free (uri); + } gconf_change_set_set_string (cs, WP_OPTIONS_KEY, item->options); }