talons

commit 045c687dd3f985ae67af9b50efe4d223e60a609e
parent 326ae475cd70f09898aa7b815e08bb3e1fca4788
Author: Colin Leroy <colin@colino.net>
Date:   Fri,  5 Jun 2009 10:14:02 +0000

2009-06-05 [colin]	3.7.1cvs68

	* src/compose.c
		Fix build on GTK+ 2.6

Diffstat:
M
ChangeLog
 | 
5
+++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/compose.c
 | 
4
++++

4 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+2009-06-05 [colin]	3.7.1cvs68
+
+	* src/compose.c
+		Fix build on GTK+ 2.6
+
 2009-06-03 [mones]	3.7.1cvs67
 
 	* tools/make.themes.project
diff --git a/PATCHSETS b/PATCHSETS
@@ -3807,3 +3807,4 @@
 ( cvs diff -u -r 1.382.2.512 -r 1.382.2.513 src/compose.c;  cvs diff -u -r 1.12.2.69 -r 1.12.2.70 src/prefs_template.c;  cvs diff -u -r 1.8.2.39 -r 1.8.2.40 src/quote_fmt.c;  ) > 3.7.1cvs65.patchset
 ( cvs diff -u -r 1.1.2.7 -r 1.1.2.8 tools/make.themes.project;  ) > 3.7.1cvs66.patchset
 ( cvs diff -u -r 1.1.2.8 -r 1.1.2.9 tools/make.themes.project;  ) > 3.7.1cvs67.patchset
+( cvs diff -u -r 1.382.2.513 -r 1.382.2.514 src/compose.c;  ) > 3.7.1cvs68.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=67
+EXTRA_VERSION=68
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/compose.c b/src/compose.c
@@ -6369,9 +6369,13 @@ static void compose_create_header_entry(Compose *compose)
 			 G_CALLBACK(compose_grab_focus_cb), compose);
 
 	/* Entry field with cleanup button */
+#if GTK_CHECK_VERSION(2, 8, 0)
 	button = gtk_button_new();
 	gtk_button_set_image(GTK_BUTTON(button),
                         gtk_image_new_from_stock(GTK_STOCK_CLEAR, GTK_ICON_SIZE_MENU));
+#else
+	button = gtk_button_new_with_label(_("Clear"));
+#endif
 	gtk_widget_show(button);
 	CLAWS_SET_TIP(button,
 		_("Delete entry contents"));