[gtk+] Set hard margins to 0 when printing n-up on unix printers

[Christian Persch <chpe src gnome org>]

commit 215eb8c9f1635551bbfb30dd4e010b6ea3d871b4
Author: Adrian Johnson <ajohnson redneon com>
Date:   Sat Nov 21 21:10:36 2009 +1030

    Set hard margins to 0 when printing n-up on unix printers

 gtk/gtkprintoperation-unix.c |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/gtk/gtkprintoperation-unix.c b/gtk/gtkprintoperation-unix.c
index 5940600..19e5644 100644
--- a/gtk/gtkprintoperation-unix.c
+++ b/gtk/gtkprintoperation-unix.c
@@ -545,8 +545,12 @@ finish_print (PrintResponseData *rdata,
       gtk_print_operation_set_print_settings (op, settings);
       priv->print_context = _gtk_print_context_new (op);
 
-      if (gtk_printer_get_hard_margins (printer, &top, &bottom, &left, &right))
-        _gtk_print_context_set_hard_margins (priv->print_context, top, bottom, left, right);
+      if (gtk_print_settings_get_number_up (settings) < 2) {
+	if (gtk_printer_get_hard_margins (printer, &top, &bottom, &left, &right))
+	  _gtk_print_context_set_hard_margins (priv->print_context, top, bottom, left, right);
+      } else {
+	_gtk_print_context_set_hard_margins (priv->print_context, 0, 0, 0, 0);
+      }
 
       if (page_setup != NULL &&
           (gtk_print_operation_get_default_page_setup (op) == NULL ||