From: Nickolay V. Shmyrev <nshmyrev@yandex.ru>
Date: Sun, 8 Oct 2006 07:29:56 +0000 (+0000)
Subject: Load document even if extension is wrong.
X-Git-Tag: EVINCE_0_6_1~7
X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=commitdiff_plain;h=217f85b9017e614505bf4a654d5b282921ff0d9e;p=evince.git

Load document even if extension is wrong.

2006-10-08  Nickolay V. Shmyrev  <nshmyrev@yandex.ru>

	* backend/ev-document-factory.c:
	(ev_document_factory_get_document):

	Load document even if extension is wrong.
---

diff --git a/ChangeLog b/ChangeLog
index aed16a1d..c89a93a9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-10-08  Nickolay V. Shmyrev  <nshmyrev@yandex.ru>
+
+	* backend/ev-document-factory.c:
+	(ev_document_factory_get_document):
+	
+	Load document even if extension is wrong.
+
 2006-10-03  Nickolay V. Shmyrev  <nshmyrev@yandex.ru>
 
 	* shell/ev-metadata-manager.c: (save_values):
diff --git a/backend/ev-document-factory.c b/backend/ev-document-factory.c
index 3b3f701a..a2ea5263 100644
--- a/backend/ev-document-factory.c
+++ b/backend/ev-document-factory.c
@@ -291,21 +291,19 @@ ev_document_factory_get_document (const char *uri, GError **error)
 
 	document = get_document_from_uri (uri, FALSE, error);
 
-	if (*error != NULL) {
-		return 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)
+	if (*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;
-	} else {
-		return document;
+		}
 	}
-
+	
 	/* Try again with slow mime detection */
 	if (document)
 		g_object_unref (document);