From bd9af3b915068db19c08ad4c39a4bdb1a8d1aa39 Mon Sep 17 00:00:00 2001 From: Colin Leroy Date: Sat, 3 May 2008 08:17:10 +0000 Subject: [PATCH] 2008-05-03 [colin] 3.4.0cvs21 * src/toolbar.c Fix bug 1597, 'In news folders, "Move Message to Wastebin" icon isn't grayed although ineffective' --- ChangeLog | 6 ++++++ PATCHSETS | 1 + configure.ac | 2 +- src/toolbar.c | 2 +- 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7303789db..a2df13c37 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-05-03 [colin] 3.4.0cvs21 + + * src/toolbar.c + Fix bug 1597, 'In news folders, "Move Message to Wastebin" + icon isn't grayed although ineffective' + 2008-05-02 [wwp] 3.4.0cvs20 * po/fr.po diff --git a/PATCHSETS b/PATCHSETS index c0538e39d..3fcc6b5b4 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -3316,3 +3316,4 @@ ( cvs diff -u -r 1.382.2.445 -r 1.382.2.446 src/compose.c; ) > 3.4.0cvs18.patchset ( cvs diff -u -r 1.30.2.48 -r 1.30.2.49 src/prefs_toolbar.c; ) > 3.4.0cvs19.patchset ( cvs diff -u -r 1.42.2.37 -r 1.42.2.38 po/fr.po; cvs diff -u -r 1.52.2.63 -r 1.52.2.64 src/prefs_folder_item.c; ) > 3.4.0cvs20.patchset +( cvs diff -u -r 1.43.2.96 -r 1.43.2.97 src/toolbar.c; ) > 3.4.0cvs21.patchset diff --git a/configure.ac b/configure.ac index 086ef5b42..be541fb62 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=4 MICRO_VERSION=0 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=20 +EXTRA_VERSION=21 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/toolbar.c b/src/toolbar.c index f8efbc886..2f3a6b317 100644 --- a/src/toolbar.c +++ b/src/toolbar.c @@ -2325,7 +2325,7 @@ void toolbar_main_set_sensitive(gpointer data) if (toolbar->trash_btn) SET_WIDGET_COND(toolbar->trash_btn, - M_TARGET_EXIST|M_ALLOW_DELETE); + M_TARGET_EXIST|M_ALLOW_DELETE|M_NOT_NEWS); if (toolbar->delete_btn) SET_WIDGET_COND(toolbar->delete_btn, -- 2.25.1