From 47c035c929220dce8bc3f92e6e5e5923f126a10a Mon Sep 17 00:00:00 2001 From: Paul Mangan Date: Thu, 18 Jan 2007 07:25:09 +0000 Subject: [PATCH] 2007-01-18 [paul] 2.7.1cvs20 * src/mainwindow.c fix sensitivity issues of Mark as Spam/Ham --- ChangeLog | 5 +++++ PATCHSETS | 1 + configure.ac | 2 +- src/mainwindow.c | 5 ++++- 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index c67296893..3a3546df0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2007-01-18 [paul] 2.7.1cvs20 + + * src/mainwindow.c + fix sensitivity issues of Mark as Spam/Ham + 2007-01-17 [fabien] 2.7.1cvs19 * src/prefs_other.c diff --git a/PATCHSETS b/PATCHSETS index 313ff2405..14aa3250e 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -2277,3 +2277,4 @@ ( cvs diff -u -r 1.94.2.118 -r 1.94.2.119 src/messageview.c; ) > 2.7.1cvs17.patchset ( cvs diff -u -r 1.395.2.277 -r 1.395.2.278 src/summaryview.c; ) > 2.7.1cvs18.patchset ( cvs diff -u -r 1.1.2.14 -r 1.1.2.15 src/prefs_other.c; cvs diff -u -r 1.204.2.118 -r 1.204.2.119 src/prefs_common.c; cvs diff -u -r 1.103.2.74 -r 1.103.2.75 src/prefs_common.h; cvs diff -u -r 1.115.2.123 -r 1.115.2.124 src/main.c; ) > 2.7.1cvs19.patchset +( cvs diff -u -r 1.274.2.164 -r 1.274.2.165 src/mainwindow.c; ) > 2.7.1cvs20.patchset diff --git a/configure.ac b/configure.ac index 25c292b1b..9dfb3fec8 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=7 MICRO_VERSION=1 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=19 +EXTRA_VERSION=20 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/mainwindow.c b/src/mainwindow.c index 3de1ec5e3..2bf26160d 100644 --- a/src/mainwindow.c +++ b/src/mainwindow.c @@ -2195,7 +2195,10 @@ SensitiveCond main_window_get_current_state(MainWindow *mainwin) } } - if (procmsg_spam_can_learn()) { + if (procmsg_spam_can_learn() && + (mainwin->summaryview->folder_item && + mainwin->summaryview->folder_item->folder->klass->type != F_UNKNOWN && + mainwin->summaryview->folder_item->folder->klass->type != F_NEWS)) { state |= M_CAN_LEARN_SPAM; } -- 2.25.1