2009-06-05 [colin] 3.7.1cvs68

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

diff --git a/ChangeLog b/ChangeLog
index b43dcc5294c05f904568690f79f8976f59132e3f..eac4c7bcaf2532f5e305c2946a6861bf460af995 100644 (file)
--- 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
index bd1e505c1a3539bcb71456194b5929fd644c9c39..291609ca0915e1c188d12dddaeedad7068c35193 100644 (file)
--- 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
index 7c2f5a77f4be99b66ce0d6e7502af34c24351735..5a3b69127c492fba4972f342dc7037f60b0a157d 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=67
+EXTRA_VERSION=68
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/compose.c b/src/compose.c
index d023b0dc3db8aac94f8908a2a17ea73283d9e564..3dc14bc8beec849f58880752da60b62801dc3605 100644 (file)
--- 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"));