Do not take margins into consideration for paper size when printing.

2006-11-09  Carlos Garcia Campos  <carlosgc@gnome.org>
	* shell/ev-window.c: (ev_window_print_dialog_response_cb):
	Do not take margins into consideration for paper size when printing.
	Really fixes bug #350491.

diff --git a/ChangeLog b/ChangeLog
index b8a5e14c60d889b75ddb7560eb5e286480b4e546..c3e5fc7b8f4117dc2181161f36bff3f0a7d79918 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-11-09  Carlos Garcia Campos  <carlosgc@gnome.org>
+
+       * shell/ev-window.c: (ev_window_print_dialog_response_cb):
+
+       Do not take margins into consideration for paper size when printing.
+       Really fixes bug #350491.
+
 2006-11-08  Carlos Garcia Campos  <carlosgc@gnome.org>
 
        * data/evince-ui.xml:

diff --git a/shell/ev-window.c b/shell/ev-window.c
index a74e570684c72770837027ec951e43b1695c4493..af4e530ffa87081f3be8b99272d6c6db0bb6a3d3 100644 (file)
--- a/shell/ev-window.c
+++ b/shell/ev-window.c
@@ -1645,16 +1645,16 @@ ev_window_print_dialog_response_cb (GtkDialog *dialog,
 
        scale = gtk_print_settings_get_scale (window->priv->print_settings) * 0.01;
        
-       width = gtk_page_setup_get_page_width (window->priv->print_page_setup,
-                                              GTK_UNIT_PIXEL);
-       height = gtk_page_setup_get_page_height (window->priv->print_page_setup,
-                                                GTK_UNIT_PIXEL);
+       width = gtk_page_setup_get_paper_width (window->priv->print_page_setup,
+                                               GTK_UNIT_PIXEL);
+       height = gtk_page_setup_get_paper_height (window->priv->print_page_setup,
+                                                 GTK_UNIT_PIXEL);
 
        if (scale != 1.0) {
                width *= scale;
                height *= scale;
        }
-       
+
        copies = gtk_print_settings_get_n_copies (window->priv->print_settings);
        collate = gtk_print_settings_get_collate (window->priv->print_settings);
        reverse = gtk_print_settings_get_reverse (window->priv->print_settings);