2007-01-18 [paul] 2.7.1cvs20
authorPaul Mangan <paul@claws-mail.org>
Thu, 18 Jan 2007 07:25:09 +0000 (07:25 +0000)
committerPaul Mangan <paul@claws-mail.org>
Thu, 18 Jan 2007 07:25:09 +0000 (07:25 +0000)
* src/mainwindow.c
fix sensitivity issues of Mark as Spam/Ham

ChangeLog
PATCHSETS
configure.ac
src/mainwindow.c

index c672968936303e64b8bf2524b877821c3bfa4808..3a3546df06fa6062304b570e45f54e911af8f199 100644 (file)
--- 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
index 313ff24054cc209a28da918f8593b1539e71d6c0..14aa3250ea681ebce4fd92281652caba6fd4d017 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( 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
index 25c292b1bc6cd45e7f5f106d33a429b98a0a221d..9dfb3fec8f4dc60e20c1c44e04971e7fb5179716 100644 (file)
@@ -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=
 
index 3de1ec5e394cd205467046bac9c40db4ace9611a..2bf26160df297928d5dd184a081c2bfd4fafd790 100644 (file)
@@ -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;
        }