From 00f9f1cc6bda6b6dd1d8091d8b8278be8af61a88 Mon Sep 17 00:00:00 2001 From: Marek Kasik Date: Fri, 20 Feb 2015 12:22:26 +0100 Subject: [PATCH] printing: Use correct units for margins taken via IPP cups_printer_get_hard_margins() returned margins in millimeters for margins taken via IPP request instead of Units used before. --- modules/printbackends/cups/gtkprintbackendcups.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/printbackends/cups/gtkprintbackendcups.c b/modules/printbackends/cups/gtkprintbackendcups.c index 15546f7189..6777673d80 100644 --- a/modules/printbackends/cups/gtkprintbackendcups.c +++ b/modules/printbackends/cups/gtkprintbackendcups.c @@ -6424,10 +6424,10 @@ cups_printer_get_hard_margins (GtkPrinter *printer, } else if (cups_printer->media_margin_default_set) { - *left = cups_printer->media_left_margin_default; - *bottom = cups_printer->media_bottom_margin_default; - *right = cups_printer->media_right_margin_default; - *top = cups_printer->media_top_margin_default; + *left = POINTS_PER_INCH * cups_printer->media_left_margin_default / MM_PER_INCH; + *bottom = POINTS_PER_INCH * cups_printer->media_bottom_margin_default / MM_PER_INCH; + *right = POINTS_PER_INCH * cups_printer->media_right_margin_default / MM_PER_INCH; + *top = POINTS_PER_INCH * cups_printer->media_top_margin_default / MM_PER_INCH; result = TRUE; }