Use a local GError, and propagate as appropriate, making sure always to

	* libdocument/ev-document-factory.c:
	(ev_document_factory_get_document): Use a local GError, and propagate
	as appropriate, making sure always to fill in @error if returning NULL.

svn path=/trunk/; revision=3459

diff --git a/ChangeLog b/ChangeLog
index 672964cf6afa33fe0e4feb47c4239812001aa064..1721e2fc5a024d335f4fcf2c162e69ff7576af0b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-02-14  Christian Persch  <chpe@gnome.org>
+
+       * libdocument/ev-document-factory.c:
+       (ev_document_factory_get_document): Use a local GError, and propagate
+       as appropriate, making sure always to fill in @error if returning NULL.
+
 2009-02-14  Christian Persch  <chpe@gnome.org>
 
        * shell/ev-window.c: (ev_window_load_job_cb): Use g_error_matches.

diff --git a/libdocument/ev-document-factory.c b/libdocument/ev-document-factory.c
index 190f8b14b84ba0800110d97329724741937ac2f5..3173d029f191352213cbc7d4dad0ea358675f2a3 100644 (file)
--- a/libdocument/ev-document-factory.c
+++ b/libdocument/ev-document-factory.c
@@ -209,84 +209,88 @@ ev_document_factory_get_document (const char *uri, GError **error)
        int result;
        EvCompressionType compression;
        gchar *uri_unc = NULL;
+       GError *err = NULL;
 
-       document = get_document_from_uri (uri, TRUE, &compression, error);
-       if (*error == NULL) {
-               uri_unc = ev_file_uncompress (uri, compression, error);
+       g_return_val_if_fail (uri != NULL, NULL);
+
+       document = get_document_from_uri (uri, TRUE, &compression, &err);
+       g_assert (document != NULL || err != NULL);
+
+       if (document != NULL) {
+               uri_unc = ev_file_uncompress (uri, compression, &err);
                if (uri_unc) {
                        g_object_set_data_full (G_OBJECT (document),
                                                "uri-uncompressed",
                                                uri_unc,
                                                (GDestroyNotify) free_uncompressed_uri);
-               }
-
-               if (*error != NULL) {
+               } else if (err != NULL) {
                        /* Error uncompressing file */
-                       if (document)
-                               g_object_unref (document);
+                       g_object_unref (document);
+                       g_propagate_error (error, err);
                        return NULL;
                }
 
-               result = ev_document_load (document, uri_unc ? uri_unc : uri, error);
+               result = ev_document_load (document, uri_unc ? uri_unc : uri, &err);
 
-               if (result == FALSE || *error) {
-                       if (*error &&
-                           (*error)->domain == EV_DOCUMENT_ERROR &&
-                           (*error)->code == EV_DOCUMENT_ERROR_ENCRYPTED)
+               if (result == FALSE || err) {
+                       if (err &&
+                           g_error_matches (err, EV_DOCUMENT_ERROR, EV_DOCUMENT_ERROR_ENCRYPTED)) {
+                               g_error_free (err);
                                return document;
+                           }
+                       /* else fall through to slow mime code section below */
                } else {
                        return document;
                }
+
+               g_object_unref (document);
+               document = NULL;
        }
        
        /* Try again with slow mime detection */
-       if (document)
-               g_object_unref (document);
-       document = NULL;
-
-       if (*error)
-               g_error_free (*error);
-       *error = NULL;
-
+       g_clear_error (&err);
        uri_unc = NULL;
 
-       document = get_document_from_uri (uri, FALSE, &compression, error);
-
-       if (*error != NULL) {
+       document = get_document_from_uri (uri, FALSE, &compression, &err);
+       if (document == NULL) {
+               g_assert (err != NULL);
+               g_propagate_error (error, err);
                return NULL;
        }
 
-       uri_unc = ev_file_uncompress (uri, compression, error);
+       uri_unc = ev_file_uncompress (uri, compression, &err);
        if (uri_unc) {
                g_object_set_data_full (G_OBJECT (document),
                                        "uri-uncompressed",
                                        uri_unc,
                                        (GDestroyNotify) free_uncompressed_uri);
-       }
-
-       if (*error != NULL) {
+       } else if (err != NULL) {
                /* Error uncompressing file */
-               if (document)
-                       g_object_unref (document);
+               g_propagate_error (error, err);
+
+               g_object_unref (document);
                return NULL;
        }
        
-       result = ev_document_load (document, uri_unc ? uri_unc : uri, error);
-
+       result = ev_document_load (document, uri_unc ? uri_unc : uri, &err);
        if (result == FALSE) {
-               if (*error == NULL) {
-                       g_set_error_literal (error,
+               if (err == NULL) {
+                       /* FIXME: this really should not happen; the backend should
+                        * always return a meaningful error.
+                        */
+                       g_set_error_literal (&err,
                                              EV_DOCUMENT_ERROR,
                                              EV_DOCUMENT_ERROR_INVALID,
                                              _("Unknown MIME Type"));
-               } else if ((*error)->domain == EV_DOCUMENT_ERROR &&
-                          (*error)->code == EV_DOCUMENT_ERROR_ENCRYPTED) {
+               } else if (g_error_matches (err, EV_DOCUMENT_ERROR, EV_DOCUMENT_ERROR_ENCRYPTED)) {
+                       g_error_free (err);
                        return document;
                }
 
-               if (document)
-                       g_object_unref (document);
+               g_object_unref (document);
                document = NULL;
+
+               g_propagate_error (error, err);
        }
        
        return document;