2009-10-05 [paul] 3.7.2cvs45

	* src/printing.c
		enable Page Size and Orientation in the print dialog,
		GTK+ >= 2.18.x only. Patch by Mark__T

diff --git a/ChangeLog b/ChangeLog
index cbda0b29b67655b45a9a64a31d9e7ad2c53d7104..958f8dca24830f49767aa06d9167d880fb993446 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-10-05 [paul]      3.7.2cvs45
+
+       * src/printing.c
+               enable Page Size and Orientation in the print dialog,
+               GTK+ >= 2.18.x only. Patch by Mark__T
+
 2009-10-05 [paul]      3.7.2cvs44
 
        * src/prefs_summaries.c

diff --git a/PATCHSETS b/PATCHSETS
index 91d3aaf7b58665be67b659da6c432beeffe62c55..b8332f42d141a3de572dfe3a7c605a7ae5e64129 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -3869,3 +3869,4 @@
 ( cvs diff -u -r 1.83.2.156 -r 1.83.2.157 src/mimeview.c;  cvs diff -u -r 1.5.2.23 -r 1.5.2.24 src/noticeview.c;  cvs diff -u -r 1.1.2.9 -r 1.1.2.10 src/gtk/gtkcmclist.c;  cvs diff -u -r 1.5.2.17 -r 1.5.2.18 src/gtk/gtkvscrollbutton.c;  cvs diff -u -r 1.1.4.35 -r 1.1.4.36 src/gtk/logwindow.c;  ) > 3.7.2cvs42.patchset
 ( cvs diff -u -r 1.10.2.17 -r 1.10.2.18 po/pl.po;  ) > 3.7.2cvs43.patchset
 ( cvs diff -u -r 1.1.2.61 -r 1.1.2.62 src/prefs_summaries.c;  ) > 3.7.2cvs44.patchset
+( cvs diff -u -r 1.1.2.26 -r 1.1.2.27 src/printing.c;  ) > 3.7.2cvs45.patchset

diff --git a/configure.ac b/configure.ac
index 2a4b9807c5e76169d753fafd0ab0cd1ac0bc21d8..f268fbb2183d9a02c0e17dc8f8cc037db2ec324e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=44
+EXTRA_VERSION=45
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/printing.c b/src/printing.c
index 8b28634436bfca725b1a0fc444a45c989b297b41..e3cad4d9d1dc16b3351e11b9c03fc782aab10af0 100644 (file)
--- a/src/printing.c
+++ b/src/printing.c
@@ -279,6 +279,10 @@ void printing_print_full(GtkWindow *parent, PrintRenderer *renderer, gpointer re
        /* Config for printing */
        gtk_print_operation_set_print_settings(op, settings);
        gtk_print_operation_set_default_page_setup(op, page_setup);
+#if GTK_CHECK_VERSION(2, 18, 0)
+        /* enable Page Size and Orientation in the print dialog */
+       gtk_print_operation_set_embed_page_setup(op, TRUE);
+#endif
 
        /* signals */
        g_signal_connect(op, "begin_print", G_CALLBACK(renderer->cb_begin_print), print_data);