*
* 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.
*
*/
* 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
* @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,
g_free (uri_unc);
}
+/**
+ * ev_document_factory_get_document:
+ * @uri: an URI
+ * @error: a #GError location to store an error, or %NULL
+ *
+ * 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.
+ */
EvDocument *
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;
gtk_file_filter_add_mime_type (filter, mime_type);
}
-void
+/**
+ * ev_document_factory_add_filters:
+ * @chooser: a #GtkFileChooser
+ * @document: a #EvDocument, or %NULL
+ *
+ * Adds some file filters to @chooser.
+
+ * Always add a "All documents" format.
+ *
+ * If @document is not %NULL, adds a #GtkFileFilter for @document's MIME type.
+ *
+ * If @document is %NULL, adds a #GtkFileFilter for each document type that evince
+ * can handle.
+ */
+void
ev_document_factory_add_filters (GtkWidget *chooser, EvDocument *document)
{
GList *all_types;
GtkFileFilter *default_filter;
GtkFileFilter *document_filter;
+ g_return_if_fail (GTK_IS_FILE_CHOOSER (chooser));
+ g_return_if_fail (document == NULL || EV_IS_DOCUMENT (document));
+
all_types = ev_backends_manager_get_all_types_info ();
default_filter = document_filter = filter = gtk_file_filter_new ();
https://www.fi.muni.cz/~kas/git / evince.git / blobdiff