AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

GktIconTheme: Be even more careful with paths

Browse Source 
This is a followup for 5a252f13a8

https://bugzilla.gnome.org/show_bug.cgi?id=733189
This commit is contained in:
Руслан Ижбулатов 2014-07-15 16:42:39 +00:00
parent 2e4018c386
commit e3d725ed8c
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
gtk/gtkicontheme.c
View File

@ -3025,18 +3025,21 @@ theme_lookup_icon (IconTheme *theme,
if (min_dir->dir)
{
gchar *uri;
file = g_strconcat (icon_name, string_from_suffix (suffix), NULL);
icon_info->filename = g_build_filename (min_dir->dir, file, NULL);
if (min_dir->is_resource)
uri = g_strconcat ("resource://", icon_info->filename, NULL);
{
gchar *uri;
uri = g_strconcat ("resource://", icon_info->filename, NULL);
icon_info->icon_file = g_file_new_for_uri (uri);
g_free (uri);
}
else
uri = g_strconcat ("file://", icon_info->filename, NULL);
icon_info->icon_file = g_file_new_for_uri (uri);
icon_info->icon_file = g_file_new_for_path (icon_info->filename);
icon_info->is_svg = suffix == ICON_SUFFIX_SVG;
icon_info->is_resource = min_dir->is_resource;
g_free (uri);
g_free (file);
}
else