X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=shell%2Fev-print-job.c;h=59a8130d93da5d0b7be050b822b16b4994ba0a17;hb=refs%2Ftags%2FEVINCE_0_5_5;hp=bb463f96108d33f57fd1e8522800350832bf18a8;hpb=0d19025d51e4a14ae553a4fc877c04261a11c902;p=evince.git

diff --git a/shell/ev-print-job.c b/shell/ev-print-job.c
index bb463f96..59a8130d 100644
--- a/shell/ev-print-job.c
+++ b/shell/ev-print-job.c
@@ -61,6 +61,7 @@ struct _EvPrintJob {
 	gboolean printing;
 	int next_page;
 	int copies_done;
+	int shift;
 };
 
 struct _EvPrintJobClass {
@@ -261,15 +262,18 @@ idle_print_handler (EvPrintJob *job)
 		ev_document_doc_mutex_lock ();
 		ev_ps_exporter_begin (
                         EV_PS_EXPORTER (job->document),
-                        job->temp_file, job->first_page, job->last_page,
+                        job->temp_file, 
+			MIN (job->first_page, job->last_page),
+			MAX (job->first_page, job->last_page),
                         job->width, job->height, job->duplex);
 		ev_document_doc_mutex_unlock ();
 		job->next_page = job->first_page;
+		job->shift = (job->first_page > job->last_page) ? -1 : 1;
 		job->printing = TRUE;
 		return TRUE;
 	}
-
-	if (job->next_page <= job->last_page) {
+	
+	if ((job->next_page - job->last_page) * job->shift <= 0) {
 		EvRenderContext *rc;
 #if 0
 		g_printerr ("Printing page %d\n", job->next_page);
@@ -286,12 +290,12 @@ idle_print_handler (EvPrintJob *job)
 			/* collate must repeat the same page */
 			job->copies_done++;
 			if(job->copies == job->copies_done) {
-				job->next_page++;
+				job->next_page += job->shift;
 				job->copies_done = 0;
 			}
 		} else {
-			job->next_page++;
-			if (job->next_page > job->last_page){
+			job->next_page += job->shift;
+			if ((job->next_page - job->last_page) * job->shift > 0){
 			        job->copies_done++;
 				if(job->copies_done < job->copies) {
 					/* more copies to go, restart to the first page */