2006-07-06 [wwp] 2.3.1cvs64

	* src/gtk/gtkutils.c
		GTK_STOCK_HELP exists in GTK+ 2.4.x.

diff --git a/ChangeLog b/ChangeLog
index e4945bc105e2c6a093c3ca7c241ad9648b7f004c..e996f71dd9d8b59cf926644a854185b23cdbce48 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-07-06 [wwp]       2.3.1cvs64
+
+       * src/gtk/gtkutils.c
+               GTK_STOCK_HELP exists in GTK+ 2.4.x.
+
 2006-07-06 [wwp]       2.3.1cvs63
 
        * src/account.c

diff --git a/PATCHSETS b/PATCHSETS
index 9f7fa1935586c61554bb89e43d5eceec04a85083..21fe35560fbcc899d6dd1f3c20c39f6f9da0413d 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1664,3 +1664,4 @@
 ( cvs diff -u -r 1.96.2.121 -r 1.96.2.122 src/textview.c;  cvs diff -u -r 1.382.2.292 -r 1.382.2.293 src/compose.c;  ) > 2.3.1cvs61.patchset
 ( cvs diff -u -r 1.96.2.122 -r 1.96.2.123 src/textview.c;  ) > 2.3.1cvs62.patchset
 ( cvs diff -u -r 1.61.2.46 -r 1.61.2.47 src/account.c;  cvs diff -u -r 1.60.2.58 -r 1.60.2.59 src/addressbook.c;  cvs diff -u -r 1.5.2.4 -r 1.5.2.5 src/addressitem.h;  cvs diff -u -r 1.207.2.108 -r 1.207.2.109 src/folderview.c;  cvs diff -u -r 1.274.2.123 -r 1.274.2.124 src/mainwindow.c;  cvs diff -u -r 1.11.2.8 -r 1.11.2.9 src/manual.c;  cvs diff -u -r 1.8.2.3 -r 1.8.2.4 src/manual.h;  cvs diff -u -r 1.3.12.15 -r 1.3.12.16 src/message_search.c;  cvs diff -u -r 1.60.2.35 -r 1.60.2.36 src/prefs_actions.c;  cvs diff -u -r 1.59.2.35 -r 1.59.2.36 src/prefs_filtering.c;  cvs diff -u -r 1.6.2.3 -r 1.6.2.4 src/prefs_filtering.h;  cvs diff -u -r 1.12.2.26 -r 1.12.2.27 src/prefs_template.c;  cvs diff -u -r 1.15.2.29 -r 1.15.2.30 src/summary_search.c;  cvs diff -u -r 1.395.2.222 -r 1.395.2.223 src/summaryview.c;  cvs diff -u -r 1.5.2.32 -r 1.5.2.33 src/gtk/gtkutils.c;  cvs diff -u -r 1.4.2.22 -r 1.4.2.23 src/gtk/gtkutils.h;  cvs diff -u -r 1.5.2.30 -r 1.5.2.31 src/gtk/pluginwindow.c;  ) > 2.3.1cvs63.patchset
+( cvs diff -u -r 1.5.2.33 -r 1.5.2.34 src/gtk/gtkutils.c;  ) > 2.3.1cvs64.patchset

diff --git a/configure.ac b/configure.ac
index 394de9fb9068fa86a0138da55a40671c8db802c1..62638da6e1ef5054f97092f042a52a23ebafd80a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=3
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=63
+EXTRA_VERSION=64
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/gtk/gtkutils.c b/src/gtk/gtkutils.c
index 165daa4412eedf48cfed1bddb8eef7dff8e24e6e..d7b86f9d667501434fa75851482415ac73bdedf7 100644 (file)
--- a/src/gtk/gtkutils.c
+++ b/src/gtk/gtkutils.c
@@ -109,11 +109,7 @@ void gtkut_stock_button_add_help(GtkWidget *bbox, GtkWidget **help_btn)
 {
        g_return_if_fail(bbox != NULL);
 
-#if GTK_CHECK_VERSION(2, 6, 0)
        *help_btn = gtk_button_new_from_stock(GTK_STOCK_HELP);
-#else
-       *help_btn = gtk_button_new_with_label(_("Help"));
-#endif
 
        GTK_WIDGET_SET_FLAGS(*help_btn, GTK_CAN_DEFAULT);
        gtk_box_pack_end(GTK_BOX (bbox), *help_btn, TRUE, TRUE, 0);