2008-06-24 [colin] 3.4.0cvs108

	* src/messageview.c
		Fix Spam button sensitivity in newsgroups

diff --git a/ChangeLog b/ChangeLog
index 8551b38213caea40f2cc286f9eec83ed94f78adf..d73e335343dd78af5cae7f0e00286d8c5564b875 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-06-24 [colin]     3.4.0cvs108
+
+       * src/messageview.c
+               Fix Spam button sensitivity in newsgroups
+
 2008-06-23 [wwp]       3.4.0cvs107
 
        * po/fr.po

diff --git a/PATCHSETS b/PATCHSETS
index cc3a832934336d7c218b196ea73e607b0b8bb767..25d1eaeb351812d1ef7b23481a09246ee3e3a7ef 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -3403,3 +3403,4 @@
 ( cvs diff -u -r 1.1.2.5 -r 1.1.2.6 manual/es/plugins.xml;  ) > 3.4.0cvs105.patchset
 ( cvs diff -u -r 1.60.2.52 -r 1.60.2.53 po/es.po;  ) > 3.4.0cvs106.patchset
 ( cvs diff -u -r 1.42.2.39 -r 1.42.2.40 po/fr.po;  ) > 3.4.0cvs107.patchset
+( cvs diff -u -r 1.94.2.180 -r 1.94.2.181 src/messageview.c;  ) > 3.4.0cvs108.patchset

diff --git a/configure.ac b/configure.ac
index d82dfcb739933838c730bb1a51c8e6025d148717..a10c228e4926bcf5fea0f32f3b7b532d4251ebfd 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=107
+EXTRA_VERSION=108
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/messageview.c b/src/messageview.c
index c9cf88c1a56a5edfb9c8c1cfd0491a8b2a0754e8..bb5b648cbdf5ed7efe92c30664d8ea77d14fceb2 100644 (file)
--- a/src/messageview.c
+++ b/src/messageview.c
@@ -1026,10 +1026,18 @@ gint messageview_show(MessageView *messageview, MsgInfo *msginfo,
                         MSG_IS_SPAM(msginfo->flags)?LEARN_HAM:LEARN_SPAM);
 
        if (messageview->toolbar) {
-               if (messageview->toolbar->learn_spam_btn)
+               if (messageview->toolbar->learn_spam_btn) {
+                       gboolean can_learn = FALSE;
+                       if (procmsg_spam_can_learn() &&
+                           (msginfo->folder &&
+                            msginfo->folder->folder->klass->type != F_UNKNOWN &&
+                            msginfo->folder->folder->klass->type != F_NEWS))
+                               can_learn = TRUE;
+
                        gtk_widget_set_sensitive(
                                messageview->toolbar->learn_spam_btn, 
-                               procmsg_spam_can_learn());
+                               can_learn);
+               }
        }
        
        noticeview_hide(messageview->noticeview);