[glabels/glabels-3_0] Fixed calculation of number of pages when printing merge jobs



commit 9e853cf05c6fd883f4023b436b06b1195b7c6c2f
Author: Jim Evins <evins snaught com>
Date:   Fri Sep 7 21:35:22 2012 -0400

    Fixed calculation of number of pages when printing merge jobs
    
    Fixes bug #680585.  Poorly placed parenthesis caused the calculation of the
    number of sheets to be wrong whenever starting on any label other than the
    first one on a page.

 src/print-op-dialog.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)
---
diff --git a/src/print-op-dialog.c b/src/print-op-dialog.c
index fdcc45a..df6cc25 100644
--- a/src/print-op-dialog.c
+++ b/src/print-op-dialog.c
@@ -478,7 +478,11 @@ custom_widget_apply_cb (GtkPrintOperation *operation,
                 gl_print_op_set_collate_flag (GL_PRINT_OP (op), collate_flag);
 
                 n_records = gl_merge_get_record_count (merge);
-                n_sheets = ceil (first - 1 + (n_copies * n_records)/(double)op->priv->labels_per_sheet);
+                n_sheets = ceil ((first - 1 + n_copies*n_records)/(double)op->priv->labels_per_sheet);
+                if ( n_sheets < 1 )
+                {
+	                n_sheets = 1;
+                }
                 gl_print_op_set_n_sheets     (GL_PRINT_OP (op), n_sheets);
 
                 g_object_unref (G_OBJECT(merge));



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]