Show the popup menu also on keybindings

[evince.git] / backend / ev-jobs.c

diff --git a/backend/ev-jobs.c b/backend/ev-jobs.c
index 355a10378e422ed8af0424db31f88979fdd25c08..c4556c95a8f506409e107e1b83860982e2c35953 100644 (file)
--- a/backend/ev-jobs.c
+++ b/backend/ev-jobs.c
@@ -170,10 +170,10 @@ ev_job_links_run (EvJobLinks *job)
 {
        g_return_if_fail (EV_IS_JOB_LINKS (job));
 
-       g_mutex_lock (EV_DOC_MUTEX);
+       ev_document_doc_mutex_lock ();
        job->model = ev_document_links_get_links_model (EV_DOCUMENT_LINKS (EV_JOB (job)->document));
        EV_JOB (job)->finished = TRUE;
-       g_mutex_unlock (EV_DOC_MUTEX);
+       ev_document_doc_mutex_unlock ();
 }
 
 
@@ -182,7 +182,8 @@ ev_job_render_new (EvDocument *document,
                   gint        page,
                   double      scale,
                   gint        width,
-                  gint        height)
+                  gint        height,
+                  gboolean    include_links)
 {
        EvJobRender *job;
 
@@ -193,6 +194,7 @@ ev_job_render_new (EvDocument *document,
        job->scale = scale;
        job->target_width = width;
        job->target_height = height;
+       job->include_links = include_links;
 
        return EV_JOB (job);
 }
@@ -202,14 +204,15 @@ ev_job_render_run (EvJobRender *job)
 {
        g_return_if_fail (EV_IS_JOB_RENDER (job));
 
-       g_mutex_lock (EV_DOC_MUTEX);
+       ev_document_doc_mutex_lock ();
 
-       ev_document_set_scale (EV_JOB (job)->document, job->scale);
-       ev_document_set_page (EV_JOB (job)->document, job->page);
-       job->pixbuf = ev_document_render_pixbuf (EV_JOB (job)->document);
+       job->pixbuf = ev_document_render_pixbuf (EV_JOB (job)->document,
+                                                job->page,
+                                                job->scale);
+       if (job->include_links)
+               job->link_mapping = ev_document_get_links (EV_JOB (job)->document, job->page);
        EV_JOB (job)->finished = TRUE;
-
-       g_mutex_unlock (EV_DOC_MUTEX);
+       ev_document_doc_mutex_unlock ();
 }
 
 EvJob *
@@ -233,7 +236,7 @@ ev_job_thumbnail_run (EvJobThumbnail *job)
 {
        g_return_if_fail (EV_IS_JOB_THUMBNAIL (job));
 
-       g_mutex_lock (EV_DOC_MUTEX);
+       ev_document_doc_mutex_lock ();
 
        job->thumbnail =
                ev_document_thumbnails_get_thumbnail (EV_DOCUMENT_THUMBNAILS (EV_JOB (job)->document),
@@ -242,5 +245,5 @@ ev_job_thumbnail_run (EvJobThumbnail *job)
                                                      TRUE);
        EV_JOB (job)->finished = TRUE;
 
-       g_mutex_unlock (EV_DOC_MUTEX);
+       ev_document_doc_mutex_unlock ();
 }