diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | backend/ev-document-factory.c | 24 | ||||
| -rw-r--r-- | configure.ac | 4 |
3 files changed, 27 insertions, 10 deletions
@@ -1,3 +1,12 @@ +2006-10-08 Wouter Bolsterlee <wbolster@gnome.org> + + * backend/ev-document-factory.c: + * configure.ac: + Assigned OpenDocument presenation MIME type to the + Impress backend. Added some missing (but harmless) + #ifdefs in the document factory as well to make things + consistent again. Fixes bug #360658. + 2006-10-08 Christian Persch <chpe@cvs.gnome.org> * backend/ev-async-renderer.c: (ev_async_renderer_get_type): diff --git a/backend/ev-document-factory.c b/backend/ev-document-factory.c index a2ea526..f524e1a 100644 --- a/backend/ev-document-factory.c +++ b/backend/ev-document-factory.c @@ -26,22 +26,28 @@ /* The various document type backends: */ #include "ev-poppler.h" -#include "pixbuf-document.h" -#include "tiff-document.h" -#include "impress-document.h" #ifdef ENABLE_PS #include "ps-document.h" #endif +#ifdef ENABLE_TIFF +#include "tiff-document.h" +#endif #ifdef ENABLE_DVI #include "dvi-document.h" #endif +#ifdef ENABLE_PIXBUF +#include "pixbuf-document.h" +#endif #ifdef ENABLE_DJVU #include "djvu-document.h" #endif #ifdef ENABLE_COMICS #include "comics-document.h" #endif +#ifdef ENABLE_IMPRESS +#include "impress-document.h" +#endif #include <string.h> #include <glib/gi18n.h> @@ -69,11 +75,6 @@ const EvDocumentType document_types[] = { {"image/x-eps", EV_BACKEND_PS, ps_document_get_type}, #endif -#ifdef ENABLE_IMPRESS - /* Impress slides: */ - {"application/vnd.sun.xml.impress", EV_BACKEND_IMPRESS, impress_document_get_type}, -#endif - #ifdef ENABLE_TIFF /* Tiff: */ {"image/tiff", EV_BACKEND_TIFF, tiff_document_get_type}, @@ -94,6 +95,13 @@ const EvDocumentType document_types[] = { {"application/x-cbr", EV_BACKEND_COMICS, comics_document_get_type}, {"application/x-cbz", EV_BACKEND_COMICS, comics_document_get_type}, #endif + +#ifdef ENABLE_IMPRESS + /* Impress slides: */ + {"application/vnd.sun.xml.impress", EV_BACKEND_IMPRESS, impress_document_get_type}, + {"application/vnd.oasis.opendocument.presentation", EV_BACKEND_IMPRESS, impress_document_get_type}, +#endif + }; #ifdef ENABLE_PIXBUF diff --git a/configure.ac b/configure.ac index d7b4efd..049e6e9 100644 --- a/configure.ac +++ b/configure.ac @@ -359,10 +359,10 @@ if test "x$enable_comics" = "xyes"; then EVINCE_MIME_TYPES="$EVINCE_MIME_TYPES;application/x-cbr;application/x-cbz" fi if test "x$enable_pixbuf" = "xyes"; then - EVINCE_MIME_TYPES="$EVINCE_MIME_TYPES;image/*" + EVINCE_MIME_TYPES="$EVINCE_MIME_TYPES;image/*" fi if test "x$enable_impress" = "xyes"; then - EVINCE_MIME_TYPES="$EVINCE_MIME_TYPES;application/vnd.sun.xml.impress" + EVINCE_MIME_TYPES="$EVINCE_MIME_TYPES;application/vnd.sun.xml.impress;application/vnd.oasis.opendocument.presentation" fi AC_SUBST(EVINCE_MIME_TYPES) |