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

GtkIconTheme: fix regression from 0db32f0632

Browse Source 
icon_info_dup() is now called also for GtkIconInfos that already have
a pixbuf, so we must make sure that we correctly carry that from
the original icon_info to the copy.
This commit is contained in:
Giovanni Campagna
2013-03-04 21:33:04 +01:00
parent 77b03a8dce
commit 9d81b69e06
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
gtk/gtkicontheme.c
View File

@ -3027,6 +3027,8 @@ icon_info_dup (GtkIconInfo *icon_info)
dup->icon_file = g_object_ref (icon_info->icon_file);
if (icon_info->loadable)
dup->loadable = g_object_ref (icon_info->loadable);
if (icon_info->pixbuf)
dup->pixbuf = g_object_ref (icon_info->pixbuf);
for (l = icon_info->emblem_infos; l != NULL; l = l->next)
{
@ -4906,9 +4908,11 @@ gtk_icon_theme_lookup_by_gicon (GtkIconTheme *icon_theme,
if (emblem_info)
info->emblem_infos = g_slist_prepend (info->emblem_infos, emblem_info);
}
}
return info;
return info;
}
else
return NULL;
}
else if (GDK_IS_PIXBUF (icon))
{