X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=libdocument%2Fev-document-factory.c;h=1f1eb0dbcfb080e5ca34af58fa51384b9e47d240;hb=9c92e571cc1a334816b2fef568c1bed1bdc0e080;hp=19a06039b3c13c67384d614409668585d72cd66c;hpb=8298693dcb5590e3c2eef00b6015109da828d962;p=evince.git diff --git a/libdocument/ev-document-factory.c b/libdocument/ev-document-factory.c index 19a06039..1f1eb0db 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. * */ @@ -33,58 +33,6 @@ #include "ev-document-factory.h" #include "ev-file-helpers.h" -#ifdef ENABLE_PIXBUF -static GList* -gdk_pixbuf_mime_type_list () -{ - GSList *formats, *list; - GList *result = NULL; - - formats = gdk_pixbuf_get_formats (); - for (list = formats; list != NULL; list = list->next) { - GdkPixbufFormat *format = list->data; - gchar **mime_types; - - if (gdk_pixbuf_format_is_disabled (format)) - continue; - - mime_types = gdk_pixbuf_format_get_mime_types (format); - result = g_list_prepend (result, mime_types); - } - g_slist_free (formats); - - return result; -} - -/* Would be nice to have this in gdk-pixbuf */ -static gboolean -mime_type_supported_by_gdk_pixbuf (const gchar *mime_type) -{ - GList *mime_types; - GList *list; - gboolean retval = FALSE; - - mime_types = gdk_pixbuf_mime_type_list (); - for (list = mime_types; list; list = list->next) { - gchar **mtypes = (gchar **)list->data; - const gchar *mtype; - gint i = 0; - - while ((mtype = mtypes[i++])) { - if (strcmp (mtype, mime_type) == 0) { - retval = TRUE; - break; - } - } - } - - g_list_foreach (mime_types, (GFunc)g_strfreev, NULL); - g_list_free (mime_types); - - return retval; -} -#endif /* ENABLE_PIXBUF */ - static EvCompressionType get_compression_from_mime_type (const gchar *mime_type) { @@ -99,6 +47,8 @@ get_compression_from_mime_type (const gchar *mime_type) return EV_COMPRESSION_GZIP; else if (g_ascii_strcasecmp (type, "bz") == 0) return EV_COMPRESSION_BZIP2; + else if (g_ascii_strcasecmp (type, "xz") == 0) + return EV_COMPRESSION_LZMA; } return EV_COMPRESSION_NONE; @@ -109,7 +59,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 +67,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, @@ -149,12 +99,6 @@ get_document_from_uri (const char *uri, } document = ev_backends_manager_get_document (mime_type); - -#ifdef ENABLE_PIXBUF - if (!document && mime_type_supported_by_gdk_pixbuf (mime_type)) - document = ev_backends_manager_get_document ("image/*"); -#endif /* ENABLE_PIXBUF */ - if (document == NULL) { gchar *content_type, *mime_desc = NULL; @@ -199,6 +143,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 +155,88 @@ ev_document_factory_get_document (const char *uri, GError **error) int result; EvCompressionType compression; gchar *uri_unc = NULL; + GError *err = NULL; + + g_return_val_if_fail (uri != NULL, NULL); - document = get_document_from_uri (uri, TRUE, &compression, error); - if (*error == NULL) { - uri_unc = ev_file_uncompress (uri, compression, error); + 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; @@ -298,26 +248,6 @@ file_filter_add_mime_types (EvTypeInfo *info, GtkFileFilter *filter) const gchar *mime_type; gint i = 0; -#ifdef ENABLE_PIXBUF - if (g_ascii_strcasecmp (info->mime_types[0], "image/*") == 0) { - GList *pixbuf_types, *l; - - pixbuf_types = gdk_pixbuf_mime_type_list (); - for (l = pixbuf_types; l; l = g_list_next (l)) { - gchar **mime_types = (gchar **)l->data; - gint j = 0; - - while ((mime_type = mime_types[j++])) - gtk_file_filter_add_mime_type (filter, mime_type); - - g_strfreev (mime_types); - } - g_list_free (pixbuf_types); - - return; - } -#endif /* ENABLE_PIXBUF */ - while ((mime_type = info->mime_types[i++])) gtk_file_filter_add_mime_type (filter, mime_type); }