From: Alexander Larsson <alexl@redhat.com>
Date: Fri, 30 Nov 2012 08:39:13 +0000 (+0100)
Subject: Don't look for icons called "(null)" if no xdg mime icon
X-Git-Tag: 2.35.3~40
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=936254c386b57ee61ccbba3fac659fc631a9cc9a;p=platform%2Fupstream%2Fglib.git

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

diff --git a/gio/gcontenttype.c b/gio/gcontenttype.c
index 2de6957..6cc805c 100644
--- a/gio/gcontenttype.c
+++ b/gio/gcontenttype.c
@@ -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);