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

GtkIconTheme: Make suffix_from_name NULL-safe

Browse Source 
This can happen sometimes with GFileIcons that are
not representable as a local path. Better not to crash
in this case.
This commit is contained in:
Matthias Clasen 2014-09-05 13:15:14 -04:00
parent f66d84deec
commit 1629903943
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
gtk/gtkicontheme.c
View File

@ -2840,18 +2840,19 @@ string_from_suffix (IconSuffix suffix)
static IconSuffix
suffix_from_name (const gchar *name)
{
IconSuffix retval;
IconSuffix retval = ICON_SUFFIX_NONE;
if (g_str_has_suffix (name, ".symbolic.png"))
retval = ICON_SUFFIX_SYMBOLIC_PNG;
else if (g_str_has_suffix (name, ".png"))
retval = ICON_SUFFIX_PNG;
else if (g_str_has_suffix (name, ".svg"))
retval = ICON_SUFFIX_SVG;
else if (g_str_has_suffix (name, ".xpm"))
retval = ICON_SUFFIX_XPM;
else
retval = ICON_SUFFIX_NONE;
if (name != NULL)
{
if (g_str_has_suffix (name, ".symbolic.png"))
retval = ICON_SUFFIX_SYMBOLIC_PNG;
else if (g_str_has_suffix (name, ".png"))
retval = ICON_SUFFIX_PNG;
else if (g_str_has_suffix (name, ".svg"))
retval = ICON_SUFFIX_SVG;
else if (g_str_has_suffix (name, ".xpm"))
retval = ICON_SUFFIX_XPM;
}
return retval;
}