luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-04-16 12:28:48 +02:00
Code Issues Packages Projects Releases Wiki Activity

Unalias. Patch by Markus Bergman

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


svn path=/trunk/; revision=7109
This commit is contained in:
Matthias Clasen 2008-06-30 04:59:40 +00:00
parent 9df3b94a0d
commit 9b89825af0
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gio/ChangeLog
View File

@ -1,3 +1,10 @@
2008-06-30 Matthias Clasen <mclasen@redhat.com>
Bug 539090 – g_content_type_from_mime_type() should unalias
* gcontentype.c (g_content_type_from_mime_type): Unalias.
Patch by Markus Bergman
2008-06-30 Matthias Clasen <mclasen@redhat.com> 2008-06-30 Matthias Clasen <mclasen@redhat.com>
Bug 538836 – make check failure on PPC and ALPHA: pltcheck.sh on Bug 538836 – make check failure on PPC and ALPHA: pltcheck.sh on

8
gio/gcontenttype.c
View File

@ -832,10 +832,16 @@ looks_like_text (const guchar *data, gsize data_size)
char * char *
g_content_type_from_mime_type (const char *mime_type) g_content_type_from_mime_type (const char *mime_type)
{ {
char *umime;
g_return_val_if_fail (mime_type != NULL, NULL); g_return_val_if_fail (mime_type != NULL, NULL);
G_LOCK (gio_xdgmime);
/* mime type and content type are same on unixes */ /* 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;
} }
/** /**