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

Update to handle GEmblem`

Browse Source 
svn path=/trunk/; revision=20980
This commit is contained in:
Matthias Clasen 2008-08-04 16:36:28 +00:00
parent 45ac6c4fc1
commit 25536fafd0
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2008-08-04 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkicontheme.c: Update to handle GEmblem.
2008-08-04 Michael Natterer <mitch@imendio.com>
* tests/prop-editor.c: undeprecate (apart from still using

18
gtk/gtkicontheme.c
View File

@ -3458,19 +3458,21 @@ gtk_icon_theme_lookup_by_gicon (GtkIconTheme *icon_theme,
else if (G_IS_EMBLEMED_ICON (icon))
{
GIcon *base, *emblem;
GList *list, *l;
GtkIconInfo *emblem_info;
base = g_emblemed_icon_get_icon (G_EMBLEMED_ICON (icon));
emblem = g_emblemed_icon_get_emblem (G_EMBLEMED_ICON (icon));
/* recursively collect information for all emblems */
info = gtk_icon_theme_lookup_by_gicon (icon_theme, base, size, flags);
if (info)
{
GtkIconInfo *emblem_info;
emblem_info = gtk_icon_theme_lookup_by_gicon (icon_theme, emblem, size / 2, flags);
if (emblem_info)
info->emblem_infos = g_slist_prepend (info->emblem_infos, emblem_info);
list = g_emblemed_icon_get_emblems (G_EMBLEMED_ICON (icon));
for (l = list; l; l = l->next)
{
emblem = g_emblem_get_icon (G_EMBLEM (l->data));
emblem_info = gtk_icon_theme_lookup_by_gicon (icon_theme, emblem, size / 2, flags);
if (emblem_info)
info->emblem_infos = g_slist_prepend (info->emblem_infos, emblem_info);
}
}
return info;