X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;ds=inline;f=shell%2Fev-document-types.c;h=7133295285ffa796d4eeb1d85e5085ec7709e195;hb=d93ec57b2282ee22ade99eba434e1b13de80bcf3;hp=cc7734f12ad95b5ab84a2880c7e1615c78ee0852;hpb=f332d42bc834d6a7b0ec58bb8e073e63bc619f63;p=evince.git diff --git a/shell/ev-document-types.c b/shell/ev-document-types.c index cc7734f1..71332952 100644 --- a/shell/ev-document-types.c +++ b/shell/ev-document-types.c @@ -27,6 +27,7 @@ /* The various document type backends: */ #include "ev-poppler.h" #include "pixbuf-document.h" +#include "tiff-document.h" #include "ps-document.h" #ifdef ENABLE_DVI #include "dvi-document.h" @@ -36,6 +37,10 @@ #endif #include +#include +#include +#include +#include typedef struct _EvDocumentType EvDocumentType; struct _EvDocumentType @@ -53,9 +58,14 @@ const EvDocumentType document_types[] = { {"application/x-gzpostscript", ps_document_get_type}, {"image/x-eps", ps_document_get_type}, +#ifdef ENABLE_TIFF + /* Tiff: */ + {"image/tiff", tiff_document_get_type}, +#endif + #ifdef ENABLE_DJVU /* djvu: */ - {"image/vnd.djvu", djvu_document_get_type), + {"image/vnd.djvu", djvu_document_get_type}, #endif #ifdef ENABLE_DVI @@ -102,16 +112,17 @@ mime_type_supported_by_gdk_pixbuf (const gchar *mime_type) return retval; } -GType -ev_document_type_lookup (const char *mime_type) + +static GType +ev_document_type_from_from_mime (const char *mime_type) { int i; - + g_return_val_if_fail (mime_type, G_TYPE_INVALID); - for (i=0;imime_type == NULL) { + g_set_error (error, + EV_DOCUMENT_ERROR, + 0, + _("Unknown MIME Type")); + gnome_vfs_file_info_unref (info); + return slow ? G_TYPE_INVALID : G_TYPE_NONE; + } + + type = ev_document_type_from_from_mime (info->mime_type); + + if (type == G_TYPE_INVALID) { + g_set_error (error, + EV_DOCUMENT_ERROR, + 0, + _("Unhandled MIME type: '%s'"), info->mime_type); + gnome_vfs_file_info_unref (info); + return slow ? G_TYPE_INVALID : G_TYPE_NONE; + } + + if (mime_type != NULL) { + *mime_type = g_strdup (info->mime_type); + } + gnome_vfs_file_info_unref (info); + + return type; +} + +GType +ev_document_type_lookup (const char *uri, gchar **mime_type, GError **error) +{ + GType type = G_TYPE_INVALID; + + type = ev_document_type_get_type (uri, FALSE, mime_type, error); + + if (type != G_TYPE_NONE) + return type; + + if (error) { + g_error_free (*error); + *error = NULL; + } + + type = ev_document_type_get_type (uri, TRUE, mime_type, error); + + return type; +}