[libdocument] Use EvPage instead of EvRenderContext in get_selected_text()

[evince.git] / libdocument / ev-document-factory.c

diff --git a/libdocument/ev-document-factory.c b/libdocument/ev-document-factory.c
index 190f8b14b84ba0800110d97329724741937ac2f5..0ace5ec8d286337df3b3d4cc5b320087b4b8f760 100644 (file)
--- 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.
  *
  */
 
@@ -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;