evince r3397 - in trunk: . shell

[carlosgc svn gnome org]

Author: carlosgc
Date: Sun Feb  1 10:35:22 2009
New Revision: 3397
URL: http://svn.gnome.org/viewvc/evince?rev=3397&view=rev

Log:
2009-02-01  Carlos Garcia Campos  <carlosgc gnome org>

	* shell/ev-print-operation.c:
	(ev_print_operation_export_print_dialog_response_cb):

	Make sure pages_per_sheet is always >= 1. Fixes bug #569328.

Modified:
   trunk/ChangeLog
   trunk/shell/ev-print-operation.c

Modified: trunk/shell/ev-print-operation.c
==============================================================================
--- trunk/shell/ev-print-operation.c	(original)
+++ trunk/shell/ev-print-operation.c	Sun Feb  1 10:35:22 2009
@@ -1072,7 +1072,7 @@
 		height *= scale;
 	}
 
-	export->pages_per_sheet = gtk_print_settings_get_number_up (print_settings);
+	export->pages_per_sheet = MAX (1, gtk_print_settings_get_number_up (print_settings));
 	
 	export->copies = gtk_print_settings_get_n_copies (print_settings);
 	export->collate = gtk_print_settings_get_collate (print_settings);
@@ -1108,7 +1108,7 @@
 	export->fc.paper_width = width;
 	export->fc.paper_height = height;
 	export->fc.duplex = FALSE;
-	export->fc.pages_per_sheet = MAX (1, export->pages_per_sheet);
+	export->fc.pages_per_sheet = export->pages_per_sheet;
 
 	if (ev_print_queue_is_empty (op->document))
 		ev_print_operation_export_begin (export);