X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;ds=sidebyside;f=libdocument%2Fev-document-factory.c;h=0ace5ec8d286337df3b3d4cc5b320087b4b8f760;hb=eb80ecd1f7aa6ff57d2a3324c691274745ca4ed0;hp=19a06039b3c13c67384d614409668585d72cd66c;hpb=8298693dcb5590e3c2eef00b6015109da828d962;p=evince.git diff --git a/libdocument/ev-document-factory.c b/libdocument/ev-document-factory.c index 19a06039..0ace5ec8 100644 --- a/libdocument/ev-document-factory.c +++ b/libdocument/ev-document-factory.c @@ -14,7 +14,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * */ @@ -109,7 +109,7 @@ get_compression_from_mime_type (const gchar *mime_type) * get_document_from_uri: * @uri: the document URI * @fast: whether to use fast MIME type detection - * @compression: return location to store the document's compression type + * @compression: a location to store the document's compression type * @error: a #GError location to store an error, or %NULL * * Creates a #EvDocument instance for the document at @uri, using either @@ -117,7 +117,7 @@ get_compression_from_mime_type (const gchar *mime_type) * @compression is filled in with the document's compression type. * On error, %NULL is returned and @error filled in. * - * Returns: a new #EvDocument instance, or %NULL on error + * Returns: a new #EvDocument instance, or %NULL on error with @error filled in */ static EvDocument * get_document_from_uri (const char *uri, @@ -199,6 +199,8 @@ free_uncompressed_uri (gchar *uri_unc) * Creates a #EvDocument for the document at @uri; or, if no backend handling * the document's type is found, or an error occurred on opening the document, * returns %NULL and fills in @error. + * If the document is encrypted, it is returned but also @error is set to + * %EV_DOCUMENT_ERROR_ENCRYPTED. * * Returns: a new #EvDocument, or %NULL. */ @@ -209,84 +211,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_propagate_error (error, 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_propagate_error (error, err); return document; } - if (document) - g_object_unref (document); + g_object_unref (document); document = NULL; + + g_propagate_error (error, err); } return document;