From 0c6afa0a95bba78223de0a44653267683597e5ba Mon Sep 17 00:00:00 2001 From: Christian Persch Date: Sun, 15 Feb 2009 13:52:04 +0000 Subject: Use the content type to get the description, not the MIME type. * libdocument/ev-document-factory.c: (get_document_from_uri): Use the content type to get the description, not the MIME type. svn path=/trunk/; revision=3443 --- diff --git a/ChangeLog b/ChangeLog index 4a0fcf9..83af467 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2009-02-14 Christian Persch + * libdocument/ev-document-factory.c: (get_document_from_uri): Use the + content type to get the description, not the MIME type. + +2009-02-14 Christian Persch + * libdocument/ev-file-helpers.c: (compression_run): Make sure to fill in @error on failure. Also, since this is exported in public APIs, cope with the passed-in GError** being NULL. diff --git a/libdocument/ev-document-factory.c b/libdocument/ev-document-factory.c index c7f2a22..f0172ff 100644 --- a/libdocument/ev-document-factory.c +++ b/libdocument/ev-document-factory.c @@ -138,15 +138,19 @@ get_document_from_uri (const char *uri, #endif /* ENABLE_PIXBUF */ if (document == NULL) { - gchar *mime_desc; + gchar *content_type, *mime_desc = NULL; + + content_type = g_content_type_from_mime_type (mime_type); + if (content_type) + mime_desc = g_content_type_get_description (content_type); - mime_desc = g_content_type_get_description (mime_type); g_set_error (error, EV_DOCUMENT_ERROR, EV_DOCUMENT_ERROR_INVALID, _("File type %s (%s) is not supported"), - mime_desc, mime_type); + mime_desc ? mime_desc : "-", mime_type); g_free (mime_desc); + g_free (content_type); g_free (mime_type); return NULL; -- cgit v0.9.1