callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More correct content type handling

Browse Source 
svn path=/trunk/; revision=20897
This commit is contained in:
Matthias Clasen
2008-07-23 04:20:15 +00:00
parent 7551360c1e
commit 830a9d2710
4 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2008-07-22 Matthias Clasen <mclasen@redhat.com>
* configure.in: Compare two content types, not content type
and mime type.
2008-07-22 Sven Herzberg <sven@imendio.com> 2008-07-22 Sven Herzberg <sven@imendio.com>
Fix svn:ignore and the include condition Fix svn:ignore and the include condition

4
configure.in
View File

@ -1044,8 +1044,10 @@ int
main (int argc, char **argv) main (int argc, char **argv)
{ {
char *content_type; char *content_type;
char *image_png;
content_type = g_content_type_guess (NULL, data, data_size, NULL); content_type = g_content_type_guess (NULL, data, data_size, NULL);
return !!strcmp (content_type, "image/png"); image_png = g_content_type_for_mime_type ("image/png");
return !!strcmp (content_type, image_png);
}]])], }]])],
[gio_can_sniff=yes [gio_can_sniff=yes
AC_DEFINE(GDK_PIXBUF_USE_GIO_MIME, 1, [Define if gio can sniff image data])], AC_DEFINE(GDK_PIXBUF_USE_GIO_MIME, 1, [Define if gio can sniff image data])],

5
gdk-pixbuf/ChangeLog
View File

@ -1,3 +1,8 @@
2008-07-23 Matthias Clasen <mclasen@redhat.com>
* gdk-pixbuf-io.c (_gdk_pixbuf_get_module): Compare two content
types, not content type and mime type.
2008-07-21 Matthias Clasen <mclasen@redhat.com> 2008-07-21 Matthias Clasen <mclasen@redhat.com>
* === Released 2.13.5 === * === Released 2.13.5 ===

6
gdk-pixbuf/gdk-pixbuf-io.c
View File

@ -770,6 +770,7 @@ _gdk_pixbuf_get_module (guchar *buffer, guint size,
#ifdef GDK_PIXBUF_USE_GIO_MIME #ifdef GDK_PIXBUF_USE_GIO_MIME
gchar *mime_type; gchar *mime_type;
gchar **mimes; gchar **mimes;
gchar *type;
gint j; gint j;
mime_type = g_content_type_guess (filename, buffer, size, NULL); mime_type = g_content_type_guess (filename, buffer, size, NULL);
@ -783,10 +784,13 @@ _gdk_pixbuf_get_module (guchar *buffer, guint size,
mimes = info->mime_types; mimes = info->mime_types;
for (j = 0; mimes[j] != NULL; j++) { for (j = 0; mimes[j] != NULL; j++) {
if (g_ascii_strcasecmp (mimes[j], mime_type) == 0) { type = g_content_type_from_mime_type (mimes[j]);
if (g_ascii_strcasecmp (type, mime_type) == 0) {
g_free (type);
selected = module; selected = module;
break; break;
} }
g_free (type);
} }
} }
g_free (mime_type); g_free (mime_type);