glib r6557 - trunk/gio

[alexl svn gnome org]

Author: alexl
Date: Fri Feb 22 14:56:50 2008
New Revision: 6557
URL: http://svn.gnome.org/viewvc/glib?rev=6557&view=rev

Log:
2008-02-22  Alexander Larsson  <alexl redhat com>

	* gcontenttype.c (g_content_type_get_icon):
	Look at old-style gnome mime icon names too, as many
	have not moved to the new style.



Modified:
   trunk/gio/ChangeLog
   trunk/gio/gcontenttype.c

Modified: trunk/gio/gcontenttype.c
==============================================================================
--- trunk/gio/gcontenttype.c	(original)
+++ trunk/gio/gcontenttype.c	Fri Feb 22 14:56:50 2008
@@ -645,7 +645,7 @@
 g_content_type_get_icon (const char *type)
 {
   char *mimetype_icon, *generic_mimetype_icon, *p;
-  char *icon_names[2];
+  char *icon_names[3];
   GThemedIcon *themed_icon;
   
   g_return_val_if_fail (type != NULL, NULL);
@@ -665,11 +665,14 @@
   generic_mimetype_icon[(p - type) + strlen ("-x-generic")] = 0;
   
   icon_names[0] = mimetype_icon;
-  icon_names[1] = generic_mimetype_icon;
+  /* Not all icons have migrated to the new icon theme spec, look for old names too */
+  icon_names[1] = g_strconcat ("gnome-mime-", mimetype_icon, NULL);
+  icon_names[2] = generic_mimetype_icon;
   
-  themed_icon = g_themed_icon_new_from_names (icon_names, 2);
+  themed_icon = g_themed_icon_new_from_names (icon_names, 3);
   
   g_free (mimetype_icon);
+  g_free (icon_names[1]);
   g_free (generic_mimetype_icon);
   
   return G_ICON (themed_icon);