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

Revert "icon theme: Avoid a string copy"

Browse Source 
This reverts commit 0895f0211e.

This negatively affected icons that are included as
resources, since peek_path returns NULL for them.
This commit is contained in:
Matthias Clasen 2019-10-17 07:15:30 -05:00
parent 468295a9f7
commit 8a603ff5bd
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gtk/gtkicontheme.c
View File

@ -3276,16 +3276,17 @@ gtk_icon_info_get_filename (GtkIconInfo *icon_info)
gboolean
gtk_icon_info_is_symbolic (GtkIconInfo *icon_info)
{
const char *path;
gchar *icon_uri;
gboolean is_symbolic;
g_return_val_if_fail (GTK_IS_ICON_INFO (icon_info), FALSE);
path = NULL;
icon_uri = NULL;
if (icon_info->icon_file)
path = g_file_peek_path (icon_info->icon_file);
icon_uri = g_file_get_uri (icon_info->icon_file);
is_symbolic = (path != NULL) && (icon_uri_is_symbolic (path, -1));
is_symbolic = (icon_uri != NULL) && (icon_uri_is_symbolic (icon_uri, -1));
g_free (icon_uri);
return is_symbolic;
}