Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarlos Garcia Campos <carlosgc@gnome.org>2010-04-03 11:09:55 (GMT)
committer Carlos Garcia Campos <carlosgc@gnome.org>2010-04-03 11:11:50 (GMT)
commit0acd3c39cb2de1cb1fcc2a4c1a886b853518424d (patch)
treed49172a3bb405a7117d3ce866bfb67db5d5792b9
parent0f458d862c2e95e61b8b546826f68f34488cf5d0 (diff)
[libview] Fix loading of compressed password-protected documents
Fixes bug #613959.
-rw-r--r--libview/ev-jobs.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/libview/ev-jobs.c b/libview/ev-jobs.c
index 20f4ee2..80e46bf 100644
--- a/libview/ev-jobs.c
+++ b/libview/ev-jobs.c
@@ -840,6 +840,8 @@ ev_job_load_run (EvJob *job)
because, e.g., a password is required - if so, just reload rather than
creating a new instance */
if (job->document) {
+ const gchar *uncompressed_uri;
+
if (job_load->password) {
ev_document_security_set_password (EV_DOCUMENT_SECURITY (job->document),
job_load->password);
@@ -848,9 +850,11 @@ ev_job_load_run (EvJob *job)
job->failed = FALSE;
job->finished = FALSE;
g_clear_error (&job->error);
-
+
+ uncompressed_uri = g_object_get_data (G_OBJECT (job->document),
+ "uri-uncompressed");
ev_document_load (job->document,
- job_load->uri,
+ uncompressed_uri ? uncompressed_uri : job_load->uri,
&error);
} else {
job->document = ev_document_factory_get_document (job_load->uri,