Fix endless loop when pages_per_sheet is 0. Fixes bug #498248.

2007-11-20  Darren Kenny  <darren.kenny@sun.com>
	* shell/ev-jobs.c: (ev_job_print_new):
	Fix endless loop when pages_per_sheet is 0. Fixes bug #498248.

svn path=/branches/gnome-2-20/; revision=2743

diff --git a/ChangeLog b/ChangeLog
index 5ca8b935d9175fb551177e95f6a66600aa516ce7..1c6d16c49992de3dcf44415372e784c2bfeb2478 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-11-20  Darren Kenny  <darren.kenny@sun.com>
+
+       * shell/ev-jobs.c: (ev_job_print_new):
+
+       Fix endless loop when pages_per_sheet is 0. Fixes bug #498248.
+       
 2007-10-29  Carlos Garcia Campos  <carlosgc@gnome.org>
 
        * shell/ev-window.c: (ev_window_open_uri),

diff --git a/shell/ev-jobs.c b/shell/ev-jobs.c
index 84eb365cd17c290512f4320a73a8a92ea522b4c2..8c59af877265ae8413e2ca68e9fd984a9166492a 100644 (file)
--- a/shell/ev-jobs.c
+++ b/shell/ev-jobs.c
@@ -735,7 +735,7 @@ ev_job_print_new (EvDocument    *document,
 
        job->page_set = page_set;
 
-       job->pages_per_sheet = pages_per_sheet;
+       job->pages_per_sheet = CLAMP (pages_per_sheet, 1, 16);
        
        job->copies = copies;
        job->collate = collate;