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

icon theme: Ensure to propagate an error

Browse Source 
If the svg pixbuf loader is not available, we end up with criticals
from gtk_css_image_icon_theme_draw because gtk_icon_info_load_symbolic
returns NULL without setting an error.

Avoid this by propagating the load error.
This commit is contained in:
Matthias Clasen 2015-10-27 11:05:00 -04:00
parent 6f340d4384
commit 270e900f55
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gtk/gtkicontheme.c
View File

@ -4441,7 +4441,11 @@ gtk_icon_info_load_symbolic_svg (GtkIconInfo *icon_info,
return NULL; return NULL;
if (!icon_info_ensure_scale_and_pixbuf (icon_info)) if (!icon_info_ensure_scale_and_pixbuf (icon_info))
return NULL; {
g_propagate_error (error, icon_info->load_error);
icon_info->load_error = NULL;
return NULL;
}
if (icon_info->symbolic_width == 0 || if (icon_info->symbolic_width == 0 ||
icon_info->symbolic_height == 0) icon_info->symbolic_height == 0)