2009-04-25 [paul] 3.7.1cvs46

	* src/printing.c
	* src/toolbar.c
		if building with GTK+ >= 2.16 use
		gtk_orientable_set_orientation() instead of now
		deprecated gtk_toolbar_set_orientation()

diff --git a/ChangeLog b/ChangeLog
index e35831994429c4bb055ea7c69dcfd0aa817c1efd..858d88c997235321a75033132c1c2696de0c80f3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2009-04-25 [paul]      3.7.1cvs46
+
+       * src/printing.c
+       * src/toolbar.c
+               if building with GTK+ >= 2.16 use
+               gtk_orientable_set_orientation() instead of now
+               deprecated gtk_toolbar_set_orientation()
+
 2009-04-24 [colin]     3.7.1cvs45
 
        * src/compose.c

diff --git a/PATCHSETS b/PATCHSETS
index 309cdfed65bb780a4348689a57543b282bb8efdb..3ad4da6476be288e973ccb6cd247e4cd8b5d1124 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -3785,3 +3785,4 @@
 ( cvs diff -u -r 1.1.2.4 -r 1.1.2.5 tools/csv2addressbook.pl;  ) > 3.7.1cvs43.patchset
 ( cvs diff -u -r 1.204.2.189 -r 1.204.2.190 src/prefs_common.c;  cvs diff -u -r 1.103.2.123 -r 1.103.2.124 src/prefs_common.h;  cvs diff -u -r 1.4.2.74 -r 1.4.2.75 src/gtk/about.c;  ) > 3.7.1cvs44.patchset
 ( cvs diff -u -r 1.382.2.506 -r 1.382.2.507 src/compose.c;  ) > 3.7.1cvs45.patchset
+( cvs diff -u -r 1.1.2.24 -r 1.1.2.25 src/printing.c;  cvs diff -u -r 1.43.2.108 -r 1.43.2.109 src/toolbar.c;  ) > 3.7.1cvs46.patchset

diff --git a/configure.ac b/configure.ac
index 213b55c37272362cfcfb64db9ed3c5ab013ec2e3..cb5d7469801b98a6ba776023841d6adbaedb9ff1 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=45
+EXTRA_VERSION=46
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/printing.c b/src/printing.c
index e8104ff62e3b7c252c767f39bcac8f140f56be29..49b28fc56f720656117b60d9b306a33466274868 100644 (file)
--- a/src/printing.c
+++ b/src/printing.c
@@ -420,7 +420,11 @@ static gboolean cb_preview(GtkPrintOperation        *operation,
   
   /* toolbar */
   toolbar = gtk_toolbar_new();
+#if (GTK_CHECK_VERSION(2,16,0))
+       gtk_orientable_set_orientation(GTK_ORIENTABLE(toolbar), GTK_ORIENTATION_HORIZONTAL);
+#else
   gtk_toolbar_set_orientation(GTK_TOOLBAR(toolbar), GTK_ORIENTATION_HORIZONTAL);
+#endif
   switch (prefs_common.toolbar_style) {
   case TOOLBAR_ICON:
     gtk_toolbar_set_style(GTK_TOOLBAR(toolbar), GTK_TOOLBAR_ICONS);

diff --git a/src/toolbar.c b/src/toolbar.c
index a3297ddc6e5156ded8f4ec0bdc57b88355334a87..5e888284083724b818ac531a1554e5679a30b40b 100644 (file)
--- a/src/toolbar.c
+++ b/src/toolbar.c
@@ -1844,7 +1844,11 @@ Toolbar *toolbar_create(ToolbarType       type,
 
        toolbar = gtk_toolbar_new();
 
+#if (GTK_CHECK_VERSION(2,16,0))
+       gtk_orientable_set_orientation(GTK_ORIENTABLE(toolbar), GTK_ORIENTATION_HORIZONTAL);
+#else
        gtk_toolbar_set_orientation(GTK_TOOLBAR(toolbar), GTK_ORIENTATION_HORIZONTAL);
+#endif
        gtk_toolbar_set_style(GTK_TOOLBAR(toolbar), GTK_TOOLBAR_BOTH);
        gtk_toolbar_set_show_arrow(GTK_TOOLBAR(toolbar), TRUE);