From: Carlos Garcia Campos Date: Sat, 19 Apr 2008 10:22:44 +0000 (+0000) Subject: Use the pixbuf backend only when the mime type is not supported by any of X-Git-Tag: EVINCE_2_23_4~36 X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=commitdiff_plain;h=f9d5f279f25fefc2c33c0bb75ee45bc26934715f;p=evince.git Use the pixbuf backend only when the mime type is not supported by any of 2008-04-19 Carlos Garcia Campos * libdocument/ev-document-factory.c: (get_document_from_uri): Use the pixbuf backend only when the mime type is not supported by any of the other backend so that tiff documents, for instance, are handled by the tiff backend instead of the pixbuf backend. fixes bug #520290. svn path=/trunk/; revision=3012 --- diff --git a/ChangeLog b/ChangeLog index 488e3165..6e6c2cb9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2008-04-19 Carlos Garcia Campos + + * libdocument/ev-document-factory.c: (get_document_from_uri): + + Use the pixbuf backend only when the mime type is not supported by + any of the other backend so that tiff documents, for instance, are + handled by the tiff backend instead of the pixbuf backend. fixes + bug #520290. + 2008-04-17 Carlos Garcia Campos * cut-n-paste/Makefile.am: diff --git a/libdocument/ev-document-factory.c b/libdocument/ev-document-factory.c index 962f42a6..c7732d8b 100644 --- a/libdocument/ev-document-factory.c +++ b/libdocument/ev-document-factory.c @@ -180,13 +180,11 @@ get_document_from_uri (const char *uri, return NULL; } + document = ev_backends_manager_get_document (mime_type); + #ifdef ENABLE_PIXBUF - if (mime_type_supported_by_gdk_pixbuf (mime_type)) + if (!document && mime_type_supported_by_gdk_pixbuf (mime_type)) document = ev_backends_manager_get_document ("image/*"); - else - document = ev_backends_manager_get_document (mime_type); -#else - document = ev_backends_manager_get_document (mime_type); #endif /* ENABLE_PIXBUF */ if (document == NULL) {