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

icontheme: fix emblemed icons fallout

Browse Source 
Commit faba7df4fe changed the logic in
apply_emblems() so that GtkIconInfo->emblems_applied would be set to
TRUE even in case there was no emblem info available, which confuses the
theme cache.
This commit changes the logic back, so that NULL is returned from
apply_emblems_to_pixbuf() when there are no emblems available, fixing
the bug.

https://bugzilla.gnome.org/show_bug.cgi?id=726830
This commit is contained in:
Cosimo Cecchi 2014-03-24 20:14:43 -04:00 committed by Matthias Clasen
parent 206d43dcb4
commit 99dc47e7fd
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gtk/gtkicontheme.c
View File

@ -3578,7 +3578,7 @@ apply_emblems_to_pixbuf (GdkPixbuf *pixbuf,
GSList *l;
if (info->emblem_infos == NULL)
return g_object_ref (pixbuf);
return NULL;
w = gdk_pixbuf_get_width (pixbuf);
h = gdk_pixbuf_get_height (pixbuf);
@ -3658,9 +3658,8 @@ apply_emblems (GtkIconInfo *info)
{
g_object_unref (info->pixbuf);
info->pixbuf = icon;
info->emblems_applied = TRUE;
}
info->emblems_applied = TRUE;
}
/* If this returns TRUE, its safe to call
@ -4174,7 +4173,7 @@ symbolic_cache_get_proxy (SymbolicPixbufCache *symbolic_cache,
}
static GdkPixbuf *
_gtk_icon_info_load_symbolic_internal (GtkIconInfo *icon_info,
_gtk_icon_info_load_symbolic_internal (GtkIconInfo *icon_info,
const GdkRGBA *fg,
const GdkRGBA *success_color,
const GdkRGBA *warning_color,
@ -4305,8 +4304,11 @@ _gtk_icon_info_load_symbolic_internal (GtkIconInfo *icon_info,
GdkPixbuf *icon;
icon = apply_emblems_to_pixbuf (pixbuf, icon_info);
g_object_unref (pixbuf);
pixbuf = icon;
if (icon != NULL)
{
g_object_unref (pixbuf);
pixbuf = icon;
}
if (use_cache)
{