evince r3453 - in trunk: . backend/tiff

[chpe svn gnome org]

Author: chpe
Date: Sun Feb 15 13:52:56 2009
New Revision: 3453
URL: http://svn.gnome.org/viewvc/evince?rev=3453&view=rev

Log:
	* backend/tiff/tiff-document.c: (tiff_document_load): Make sure
	to always set @error when returning FALSE.

Modified:
   trunk/ChangeLog
   trunk/backend/tiff/tiff-document.c

Modified: trunk/backend/tiff/tiff-document.c
==============================================================================
--- trunk/backend/tiff/tiff-document.c	(original)
+++ trunk/backend/tiff/tiff-document.c	Sun Feb 15 13:52:56 2009
@@ -91,13 +91,11 @@
 	gchar *filename;
 	TIFF *tiff;
 	
-	push_handlers ();
 	filename = g_filename_from_uri (uri, NULL, error);
-	if (!filename) {
-		pop_handlers ();
+	if (!filename)
 		return FALSE;
-	}
 	
+	push_handlers ();
 	tiff = TIFFOpen (filename, "r");
 	if (tiff) {
 		guint32 w, h;
@@ -109,6 +107,13 @@
 	
 	if (!tiff) {
 		pop_handlers ();
+
+    		g_set_error_literal (error,
+				     EV_DOCUMENT_ERROR,
+				     EV_DOCUMENT_ERROR_INVALID,
+				     _("Invalid document"));
+
+		g_free (filename);
 		return FALSE;
 	}