X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;ds=sidebyside;f=backend%2Fev-document-factory.c;h=3b3f701a5ce6edf54aa5f7100ab9f833e1705614;hb=2409a4e2aba8f8c83365492f44e8c3c801b852f8;hp=e3f384f9b864a0b121289e672a0cf3b9e87ccfc1;hpb=d18bf1f949a0d4fb15b3bbd6daa6b8a59ebdc3f2;p=evince.git

diff --git a/backend/ev-document-factory.c b/backend/ev-document-factory.c
index e3f384f9..3b3f701a 100644
--- a/backend/ev-document-factory.c
+++ b/backend/ev-document-factory.c
@@ -28,6 +28,8 @@
 #include "ev-poppler.h"
 #include "pixbuf-document.h"
 #include "tiff-document.h"
+#include "impress-document.h"
+
 #ifdef ENABLE_PS
 #include "ps-document.h"
 #endif
@@ -67,6 +69,11 @@ 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},
@@ -280,28 +287,58 @@ EvDocument *
 ev_document_factory_get_document (const char *uri, GError **error)
 {
 	EvDocument *document;
+	int result;
 
 	document = get_document_from_uri (uri, FALSE, error);
 
-	if (*error == NULL) {
-		ev_document_load (document, uri, error);
+	if (*error != NULL) {
+		return NULL;
 	}
-	
-	if (*error) {
-		g_error_free (*error);
-		*error = NULL;
+
+	result = ev_document_load (document, uri, error);
+
+	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);
+	*error = NULL;
+
 	document = get_document_from_uri (uri, TRUE, error);
 
 	if (*error != NULL) {
 		return NULL;
 	}
 
-	ev_document_load (document, uri, error);
+	result = ev_document_load (document, uri, 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;
+	}
+	
 	return document;
 }
 
@@ -395,6 +432,16 @@ ev_document_factory_add_filters (GtkWidget *chooser, EvDocument *document)
 	}
 #endif	
 
+#ifdef ENABLE_IMPRESS
+	if (document == NULL || backend == EV_BACKEND_IMPRESS) {
+		default_filter = filter = gtk_file_filter_new ();
+		gtk_file_filter_set_name (filter, _("Impress Slides"));
+		mime_types = ev_document_factory_get_mime_types (EV_BACKEND_IMPRESS);
+		file_filter_add_mime_list_and_free (filter, mime_types);
+		gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (chooser), filter);
+	}
+#endif	
+
 	filter = gtk_file_filter_new ();
 	gtk_file_filter_set_name (filter, _("All Files"));
 	gtk_file_filter_add_pattern (filter, "*");