X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=libview%2Fev-jobs.c;h=140c51ad9a9e67b936fbe31cb9941cf516f44bab;hb=2297bff1e7d745f0f837d44feeda03244368d7f1;hp=20f4ee21775719e6620dd4adafe58a2a13b5a73b;hpb=a90c2239d39181519c53f0b02b5af90be0d7ef3d;p=evince.git diff --git a/libview/ev-jobs.c b/libview/ev-jobs.c index 20f4ee21..140c51ad 100644 --- a/libview/ev-jobs.c +++ b/libview/ev-jobs.c @@ -15,7 +15,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. */ #include @@ -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, @@ -1083,7 +1087,7 @@ ev_job_find_dispose (GObject *object) gint i; for (i = 0; i < job->n_pages; i++) { - g_list_foreach (job->pages[i], (GFunc)g_free, NULL); + g_list_foreach (job->pages[i], (GFunc)ev_rectangle_free, NULL); g_list_free (job->pages[i]); }