talons

commit fdf06fa237db1f435e639ab8fa6f446e6587cb1b
parent 3002607bf3f9836127098ad738e3423fedaa5a36
Author: Paul Mangan <paul@claws-mail.org>
Date:   Sat, 25 Apr 2009 07:09:24 +0000

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()

Diffstat:
M
ChangeLog
 | 
8
++++++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/printing.c
 | 
4
++++
M
src/toolbar.c
 | 
4
++++

5 files changed, 18 insertions(+), 1 deletion(-)
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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);