talons

commit 59bb3b4d5838f3622cda4bae09cfe0498e1096ca
parent 447fad50aa94751eb2f6258e251129ae230b2802
Author: Colin Leroy <colin@colino.net>
Date:   Tue, 24 Jun 2008 05:45:58 +0000

2008-06-24 [colin]	3.4.0cvs108

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

Diffstat:
M
ChangeLog
 | 
5
+++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/messageview.c
 | 
12
++++++++++--

4 files changed, 17 insertions(+), 3 deletions(-)
diff --git 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
@@ -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
@@ -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
@@ -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);