luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-03-03 06:32:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Don't look for icons called "(null)" if no xdg mime icon

Browse Source
This commit is contained in:
Alexander Larsson 2012-11-30 09:39:13 +01:00
parent edf94ba263
commit 936254c386
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gio/gcontenttype.c
View File

@ -401,13 +401,14 @@ g_content_type_get_icon_internal (const gchar *type,
char *mimetype_icon;
char *generic_mimetype_icon = NULL;
char *q;
char *xdg_mimetype_icon;
char *xdg_mimetype_icon = NULL;
char *legacy_mimetype_icon;
char *xdg_mimetype_generic_icon;
char *icon_names[5];
int n = 0;
GIcon *themed_icon;
const char *file_template;
const char *xdg_icon;
g_return_val_if_fail (type != NULL, NULL);
@ -421,8 +422,10 @@ g_content_type_get_icon_internal (const gchar *type,
}
G_LOCK (gio_xdgmime);
xdg_mimetype_icon = g_strdup_printf (file_template, xdg_mime_get_icon (type));
xdg_icon = xdg_mime_get_icon (type);
G_UNLOCK (gio_xdgmime);
if (xdg_icon != NULL)
xdg_mimetype_icon = g_strdup_printf (file_template, xdg_icon);
xdg_mimetype_generic_icon = g_content_type_get_generic_icon_name (type);
mimetype_icon = g_strdup_printf (file_template, type);