callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

icontheme: Use correct URI for icons in resource paths

Browse Source 
Fix based on a patch by Stefano Faccini,
https://bugzilla.gnome.org/show_bug.cgi?id=732894
This commit is contained in:
Stefano Facchini
2014-07-08 14:12:39 +02:00
committed by Matthias Clasen
parent b31a310d7d
commit cd71a23ee2
1 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
gtk/gtkicontheme.c
View File

@ -1759,6 +1759,7 @@ real_choose_icon (GtkIconTheme *icon_theme,
if (unthemed_icon) if (unthemed_icon)
{ {
gchar *uri;
icon_info = icon_info_new (ICON_THEME_DIR_UNTHEMED, size, 1); icon_info = icon_info_new (ICON_THEME_DIR_UNTHEMED, size, 1);
/* A SVG icon, when allowed, beats out a XPM icon, but not a PNG icon */ /* A SVG icon, when allowed, beats out a XPM icon, but not a PNG icon */
@ -1770,9 +1771,14 @@ real_choose_icon (GtkIconTheme *icon_theme,
else if (unthemed_icon->no_svg_filename) else if (unthemed_icon->no_svg_filename)
icon_info->filename = g_strdup (unthemed_icon->no_svg_filename); icon_info->filename = g_strdup (unthemed_icon->no_svg_filename);
icon_info->icon_file = g_file_new_for_path (icon_info->filename); if (unthemed_icon->is_resource)
uri = g_strconcat ("resource://", icon_info->filename, NULL);
else
uri = g_strconcat ("file://", icon_info->filename, NULL);
icon_info->icon_file = g_file_new_for_uri (uri);
icon_info->is_svg = suffix_from_name (icon_info->filename) == ICON_SUFFIX_SVG; icon_info->is_svg = suffix_from_name (icon_info->filename) == ICON_SUFFIX_SVG;
icon_info->is_resource = unthemed_icon->is_resource; icon_info->is_resource = unthemed_icon->is_resource;
g_free (uri);
} }
out: out:
@ -3016,11 +3022,18 @@ theme_lookup_icon (IconTheme *theme,
if (min_dir->dir) if (min_dir->dir)
{ {
gchar *uri;
file = g_strconcat (icon_name, string_from_suffix (suffix), NULL); file = g_strconcat (icon_name, string_from_suffix (suffix), NULL);
icon_info->filename = g_build_filename (min_dir->dir, file, NULL); icon_info->filename = g_build_filename (min_dir->dir, file, NULL);
icon_info->icon_file = g_file_new_for_path (icon_info->filename); if (min_dir->is_resource)
uri = g_strconcat ("resource://", icon_info->filename, NULL);
else
uri = g_strconcat ("file://", icon_info->filename, NULL);
icon_info->icon_file = g_file_new_for_uri (uri);
icon_info->is_svg = suffix == ICON_SUFFIX_SVG; icon_info->is_svg = suffix == ICON_SUFFIX_SVG;
icon_info->is_resource = min_dir->is_resource; icon_info->is_resource = min_dir->is_resource;
g_free (uri);
g_free (file); g_free (file);
} }
else else