applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make sure that the UTF8 filename is valid and exists before trying to use

Browse source 
2005-10-01  Rodney Dawes  <dobey@novell.com>

	* preferences.c (bg_preferences_load, bg_preferences_merge_entry):
	Make sure that the UTF8 filename is valid and exists before trying
	to use it, otherwise fall back to using the filename encoding specified
	by the user with the environment variables used by glib to determine
	the locale encoding of filenames

	Fixes #168604
This commit is contained in:
Rodney Dawes 2005-10-01 21:18:21 +00:00 • committed by Rodney Dawes
parent 4804708384
commit 3d5e4d4e75
2 changed files with 30 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
libbackground/ChangeLog
View file

@ -1,3 +1,13 @@
2005-10-01 Rodney Dawes <dobey@novell.com>
* preferences.c (bg_preferences_load, bg_preferences_merge_entry):
Make sure that the UTF8 filename is valid and exists before trying
to use it, otherwise fall back to using the filename encoding specified
by the user with the environment variables used by glib to determine
the locale encoding of filenames
Fixes #168604
2005-06-10 Kjartan Maraas <kmaraas@gnome.org>
* applier.c: (render_wallpaper), (is_nautilus_running): GCC4

22
libbackground/preferences.c
View file

@ -237,13 +237,21 @@ bg_preferences_load (BGPreferences *prefs)
GConfClient *client;
GError *error = NULL;
char *tmp;
g_return_if_fail (prefs != NULL);
g_return_if_fail (IS_BG_PREFERENCES (prefs));
client = gconf_client_get_default ();
prefs->enabled = gconf_client_get_bool (client, BG_PREFERENCES_DRAW_BACKGROUND, &error);
prefs->wallpaper_filename = gconf_client_get_string (client, BG_PREFERENCES_PICTURE_FILENAME, &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);
g_free (tmp);
if (prefs->color1 != NULL)
gdk_color_free (prefs->color1);
@ -303,7 +311,17 @@ bg_preferences_merge_entry (BGPreferences *prefs,
}
}
else if (!strcmp (entry->key, BG_PREFERENCES_PICTURE_FILENAME)) {
prefs->wallpaper_filename = g_strdup (gconf_value_get_string (value));
const char *tmp;
tmp = gconf_value_get_string (value);
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 (prefs->wallpaper_filename != NULL &&
strcmp (prefs->wallpaper_filename, "") != 0 &&