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'

diff --git a/ChangeLog b/ChangeLog
index 7303789db9f264f7122eb360d02564ef9d791656..a2df13c37ca9460e0f0434d65ad62027b42127f6 100644 (file)
--- 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 c0538e39d0e0ce7366e3d829fd68b3dbe6b46e96..3fcc6b5b41ade646f9e4ea05dd91c3a980c9e1c4 100644 (file)
--- 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 086ef5b420eb5dacaddb55374719701c83151459..be541fb627099123396954928ed06ea7ccd28bbf 100644 (file)
--- 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 f8efbc886e6c8be7f9d5f70ce7951c2b59216139..2f3a6b31718d37f12e50844ebe900fa07d95bd50 100644 (file)
--- 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,