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

always use URIs instead for info->path; since gio cleanly distinguishes

Browse source 
2008-05-01  Jens Granseuer  <jensgr@gmx.net>

	* gnome-theme-info.c: (read_cursor_theme), (read_cursor_fonts),
	(update_theme_index): always use URIs instead for info->path; since
	gio cleanly distinguishes path/uri (contrary to gnome-vfs), the
	random mix we have right now is becoming a nuisance

svn path=/trunk/; revision=8684
This commit is contained in:
Jens Granseuer 2008-05-01 14:11:38 +00:00 • committed by Jens Granseuer
parent 565c037cc7
commit a9e90ad542
2 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
capplets/common/ChangeLog
View file

@ -1,3 +1,10 @@
2008-05-01 Jens Granseuer <jensgr@gmx.net>
* gnome-theme-info.c: (read_cursor_theme), (read_cursor_fonts),
(update_theme_index): always use URIs instead for info->path; since
gio cleanly distinguishes path/uri (contrary to gnome-vfs), the
random mix we have right now is becoming a nuisance
2008-05-01 Jens Granseuer <jensgr@gmx.net> 2008-05-01 Jens Granseuer <jensgr@gmx.net>
* gnome-theme-apply.c: * gnome-theme-apply.c:

6
capplets/common/gnome-theme-info.c
View file

@ -532,7 +532,7 @@ read_cursor_theme (GFile *cursor_theme_uri)
} }
cursor_theme_info = gnome_theme_cursor_info_new (); cursor_theme_info = gnome_theme_cursor_info_new ();
cursor_theme_info->path = g_file_get_path (parent_uri); cursor_theme_info->path = g_file_get_uri (parent_uri);
cursor_theme_info->name = name; cursor_theme_info->name = name;
cursor_theme_info->sizes = sizes; cursor_theme_info->sizes = sizes;
cursor_theme_info->thumbnail = thumbnail; cursor_theme_info->thumbnail = thumbnail;
@ -658,7 +658,7 @@ read_cursor_fonts (void)
theme_info->thumbnail = gdk_pixbuf_new_from_file (filename, NULL); theme_info->thumbnail = gdk_pixbuf_new_from_file (filename, NULL);
g_free (filename); g_free (filename);
theme_info->path = g_build_filename (GNOMECC_DATA_DIR, builtins[i][0], NULL); theme_info->path = g_build_filename ("file://" GNOMECC_DATA_DIR, builtins[i][0], NULL);
theme_info->name = g_strdup (theme_info->path); theme_info->name = g_strdup (theme_info->path);
if (!strcmp (theme_info->path, cursor_font)) if (!strcmp (theme_info->path, cursor_font))
@ -753,7 +753,7 @@ update_theme_index (GFile *index_uri,
/* Next, we see what currently exists */ /* Next, we see what currently exists */
parent = g_file_get_parent (index_uri); parent = g_file_get_parent (index_uri);
common_theme_dir_uri = g_file_get_parent (parent); common_theme_dir_uri = g_file_get_parent (parent);
common_theme_dir = g_file_get_path (common_theme_dir_uri); common_theme_dir = g_file_get_uri (common_theme_dir_uri);
theme_info = g_hash_table_lookup (theme_hash_by_uri, common_theme_dir); theme_info = g_hash_table_lookup (theme_hash_by_uri, common_theme_dir);
if (theme_info == NULL) { if (theme_info == NULL) {