From: Carlos Garcia Campos <carlosgc@gnome.org>
Date: Fri, 5 Jun 2009 16:55:20 +0000 (+0200)
Subject: [printing] Use always default page setup before printing
X-Git-Tag: EVINCE_2_27_3~47
X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=commitdiff_plain;h=d72a2c802a149f327c65bfcc30e47dae7eb11a3c;p=evince.git

[printing] Use always default page setup before printing
---

diff --git a/shell/ev-window.c b/shell/ev-window.c
index ded233d8..91299063 100644
--- a/shell/ev-window.c
+++ b/shell/ev-window.c
@@ -3006,6 +3006,12 @@ ev_window_print_range (EvWindow *ev_window,
 		ev_window_load_print_settings_from_metadata (ev_window);
 	}
 
+	if (!ev_window->priv->print_page_setup) {
+		ev_window->priv->print_page_setup = gtk_page_setup_copy (
+			ev_application_get_page_setup (EV_APP));
+		ev_window_load_print_page_setup_from_metadata (ev_window);
+	}
+
 	if (first_page != 1 || last_page != document_last_page) {
 		GtkPageRange range;
 
@@ -3022,8 +3028,7 @@ ev_window_print_range (EvWindow *ev_window,
 	ev_print_operation_set_job_name (op, gtk_window_get_title (GTK_WINDOW (ev_window)));
 	ev_print_operation_set_current_page (op, current_page);
 	ev_print_operation_set_print_settings (op, ev_window->priv->print_settings);
-	if (ev_window->priv->print_page_setup)
-		ev_print_operation_set_default_page_setup (op, ev_window->priv->print_page_setup);
+	ev_print_operation_set_default_page_setup (op, ev_window->priv->print_page_setup);
 
 	ev_print_operation_run (op, GTK_WINDOW (ev_window));
 }