Use the pixbuf backend only when the mime type is not supported by any of

2008-04-19  Carlos Garcia Campos  <carlosgc@gnome.org>

	* 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=/branches/gnome-2-22/; revision=3013

diff --git a/ChangeLog b/ChangeLog
index 429b6b321d51ac668747754e23036f69bd74726a..a7d4747ed33e96c9d17f24c2fb35fdd74fe5aadb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-04-19  Carlos Garcia Campos  <carlosgc@gnome.org>
+
+       * 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-08  Nickolay V. Shmyrev  <nshmyrev@yandex.ru>
 
        * NEWS:

diff --git a/libdocument/ev-document-factory.c b/libdocument/ev-document-factory.c
index 962f42a604250c39857e9df399ed0a29ab4cba36..c7732d8bfb9f9e85b81265b7d0434baf7822425d 100644 (file)
--- 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) {