X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=shell%2Fev-jobs.c;h=72ed96142b26f65767321246bc7b9dca26aee970;hb=65c06150e05948eb7b056b0ec5cb9c364b652cfe;hp=677b39f046961a8bee2e77e338227cbd526359b3;hpb=96ab01a78dafd62f121b11010a9857cbd9a7922c;p=evince.git

diff --git a/shell/ev-jobs.c b/shell/ev-jobs.c
index 677b39f0..72ed9614 100644
--- a/shell/ev-jobs.c
+++ b/shell/ev-jobs.c
@@ -116,6 +116,16 @@ ev_job_render_dispose (GObject *object)
 		job->rc = NULL;
 	}
 
+	if (job->selection) {
+		g_object_unref (job->selection);
+		job->selection = NULL;
+	}
+
+	if (job->selection_region) {
+		gdk_region_destroy (job->selection_region);
+		job->selection_region = NULL;
+	}
+
 	(* G_OBJECT_CLASS (ev_job_render_parent_class)->dispose) (object);
 }
 
@@ -226,6 +236,8 @@ ev_job_render_new (EvDocument      *document,
 		   gint             width,
 		   gint             height,
 		   EvRectangle     *selection_points,
+		   GdkColor        *text,
+		   GdkColor        *base,
 		   gboolean         include_links,
 		   gboolean         include_text,
 		   gboolean         include_selection)
@@ -242,6 +254,8 @@ ev_job_render_new (EvDocument      *document,
 	job->rc = g_object_ref (rc);
 	job->target_width = width;
 	job->target_height = height;
+	job->text = *text;
+	job->base = *base;
 	job->include_links = include_links;
 	job->include_text = include_text;
 	job->include_selection = include_selection;
@@ -285,12 +299,18 @@ ev_job_render_run (EvJobRender *job)
 			job->link_mapping = ev_document_get_links (EV_JOB (job)->document, job->rc->page);
 		if (job->include_text && EV_IS_SELECTION (EV_JOB (job)->document))
 			job->text_mapping = ev_selection_get_selection_map (EV_SELECTION (EV_JOB (job)->document), job->rc);
-		if (job->include_selection && EV_IS_SELECTION (EV_JOB (job)->document))
+		if (job->include_selection && EV_IS_SELECTION (EV_JOB (job)->document)) {
 			ev_selection_render_selection (EV_SELECTION (EV_JOB (job)->document),
 						       job->rc,
 						       &(job->selection),
 						       &(job->selection_points),
-						       NULL);
+						       NULL,
+						       &(job->text), &(job->base));
+			job->selection_region =
+				ev_selection_get_selection_region (EV_SELECTION (EV_JOB (job)->document),
+								   job->rc,
+								   &(job->selection_points));
+		}
 
 		EV_JOB (job)->finished = TRUE;
 	}
@@ -301,7 +321,7 @@ ev_job_render_run (EvJobRender *job)
 EvJob *
 ev_job_thumbnail_new (EvDocument   *document,
 		      gint          page,
-		      EvOrientation orientation,
+		      int           rotation,
 		      gint          requested_width)
 {
 	EvJobThumbnail *job;
@@ -310,7 +330,7 @@ ev_job_thumbnail_new (EvDocument   *document,
 
 	EV_JOB (job)->document = g_object_ref (document);
 	job->page = page;
-	job->orientation = orientation;
+	job->rotation = rotation;
 	job->requested_width = requested_width;
 
 	return EV_JOB (job);
@@ -326,7 +346,7 @@ ev_job_thumbnail_run (EvJobThumbnail *job)
 	job->thumbnail =
 		ev_document_thumbnails_get_thumbnail (EV_DOCUMENT_THUMBNAILS (EV_JOB (job)->document),
 						      job->page,
-						      job->orientation,
+						      job->rotation,
 						      job->requested_width,
 						      TRUE);
 	EV_JOB (job)->finished = TRUE;