Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--shell/ev-print-operation.c4
2 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 4215dc3..d27c65f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,11 @@
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.
+
+2009-02-01 Carlos Garcia Campos <carlosgc@gnome.org>
* backend/pdf/ev-poppler.cc: (ev_link_dest_from_dest):
diff --git a/shell/ev-print-operation.c b/shell/ev-print-operation.c
index 3723bd8..44ce674 100644
--- a/shell/ev-print-operation.c
+++ b/shell/ev-print-operation.c
@@ -1072,7 +1072,7 @@ ev_print_operation_export_print_dialog_response_cb (GtkDialog *dial
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 @@ ev_print_operation_export_print_dialog_response_cb (GtkDialog *dial
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);