]> www.fi.muni.cz Git - evince.git/commitdiff
[printing] Use always default page setup before printing
authorCarlos Garcia Campos <carlosgc@gnome.org>
Fri, 5 Jun 2009 16:55:20 +0000 (18:55 +0200)
committerCarlos Garcia Campos <carlosgc@gnome.org>
Fri, 5 Jun 2009 16:55:20 +0000 (18:55 +0200)
shell/ev-window.c

index ded233d856375bc2e94316863e5088643f44bd68..91299063f169f594b1b914f298e9a851c1963540 100644 (file)
@@ -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));
 }