Use always "Document Viewer" in about dialog.

[evince.git] / backend / ev-document-factory.c

diff --git a/backend/ev-document-factory.c b/backend/ev-document-factory.c
index 278a21a1be1976a4531d5b55c620fffc8dc48139..78be656cf1ff0cb7f9e6095321f1f22bba103da1 100644 (file)
--- 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>
@@ -59,8 +65,10 @@ struct _EvDocumentType
 };
 
 const EvDocumentType document_types[] = {
+#ifdef ENABLE_PDF
        /* PDF: */
        {"application/pdf",            EV_BACKEND_PDF,  pdf_document_get_type},
+#endif
 
 #ifdef ENABLE_PS
        /* Postscript: */
@@ -69,11 +77,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 +97,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
@@ -291,19 +301,23 @@ ev_document_factory_get_document (const char *uri, GError **error)
 
        document = get_document_from_uri (uri, FALSE, error);
 
-       if (*error != NULL) {
-               return NULL;
-       }
+       if (*error == NULL) {
+               result = ev_document_load (document, uri, error);
 
-       result = ev_document_load (document, uri, error);
-       
-       if (result == FALSE || *error) {
-               if (document)
-                       g_object_unref (document);
-               document = NULL;
-       } else {
-               return document;
+               if (result == FALSE || *error) {
+                       if (*error &&
+                           (*error)->domain == EV_DOCUMENT_ERROR &&
+                           (*error)->code == EV_DOCUMENT_ERROR_ENCRYPTED)
+                               return document;
+               } else {
+                       return document;
+               }
        }
+       
+       /* Try again with slow mime detection */
+       if (document)
+               g_object_unref (document);
+       document = NULL;
 
        if (*error)
                g_error_free (*error);
@@ -316,20 +330,23 @@ ev_document_factory_get_document (const char *uri, GError **error)
        }
 
        result = ev_document_load (document, uri, error);
-       
-       if (result == FALSE || *error) {
+
+       if (result == FALSE) {
+               if (*error == NULL) {
+                       g_set_error (error,
+                                    EV_DOCUMENT_ERROR,
+                                    0,
+                                    _("Unknown MIME Type"));
+               } else if ((*error)->domain == EV_DOCUMENT_ERROR &&
+                          (*error)->code == EV_DOCUMENT_ERROR_ENCRYPTED) {
+                       return document;
+               }
+
                if (document)
                        g_object_unref (document);
                document = NULL;
        }
-
-       if (result == FALSE && *error == NULL)  {
-               g_set_error (error,
-                            EV_DOCUMENT_ERROR,
-                            0,
-                            _("Unknown MIME Type"));
-       }
-
+       
        return document;
 }
 
@@ -375,6 +392,7 @@ ev_document_factory_add_filters (GtkWidget *chooser, EvDocument *document)
        }
 #endif
 
+#ifdef ENABLE_PDF
        if (document == NULL || backend == EV_BACKEND_PDF) {
                default_filter = filter = gtk_file_filter_new ();
                gtk_file_filter_set_name (filter, _("PDF Documents"));
@@ -382,6 +400,7 @@ ev_document_factory_add_filters (GtkWidget *chooser, EvDocument *document)
                file_filter_add_mime_list_and_free (filter, mime_types);
                gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (chooser), filter);
        }
+#endif
 
 #ifdef ENABLE_PIXBUF
        if (document == NULL || backend == EV_BACKEND_PIXBUF) {