Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarlos Garcia Campos <carlosgc@gnome.org>2008-04-19 10:22:44 (GMT)
committer Carlos Garcia Campos <carlosgc@src.gnome.org>2008-04-19 10:22:44 (GMT)
commitf9d5f279f25fefc2c33c0bb75ee45bc26934715f (patch)
tree5735cc36a78ca21dd2df111e4c3fa7538d3c1d7d
parent1eee108e90592d263f7621fe298e9f73d23fe67c (diff)
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=/trunk/; revision=3012
-rw-r--r--ChangeLog9
-rw-r--r--libdocument/ev-document-factory.c8
2 files changed, 12 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 488e316..6e6c2cb 100644
--- 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-17 Carlos Garcia Campos <carlosgc@gnome.org>
* cut-n-paste/Makefile.am:
diff --git a/libdocument/ev-document-factory.c b/libdocument/ev-document-factory.c
index 962f42a..c7732d8 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) {