glib r7109 - trunk/gio

[matthiasc svn gnome org]

Author: matthiasc
Date: Mon Jun 30 04:59:40 2008
New Revision: 7109
URL: http://svn.gnome.org/viewvc/glib?rev=7109&view=rev

Log:
        * gcontentype.c (g_content_type_from_mime_type): Unalias.
        Patch by Markus Bergman



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

Modified: trunk/gio/gcontenttype.c
==============================================================================
--- trunk/gio/gcontenttype.c	(original)
+++ trunk/gio/gcontenttype.c	Mon Jun 30 04:59:40 2008
@@ -832,10 +832,16 @@
 char *
 g_content_type_from_mime_type (const char *mime_type)
 {
+  char *umime;
+
   g_return_val_if_fail (mime_type != NULL, NULL);
 
+  G_LOCK (gio_xdgmime);
   /* mime type and content type are same on unixes */
-  return g_strdup (mime_type);
+  umime = g_strdup (xdg_mime_unalias_mime_type (mime_type));
+  G_LOCK (gio_xdgmime);
+
+  return umime;
 }
 
 /**