Update of /cvsroot/mahogany/M/src/gui
In directory usw-pr-cvs1:/tmp/cvs-serv19662/src/gui
Modified Files:
wxFiltersDialog.cpp
Log Message:
added test for SpamAssassin tag
Index: wxFiltersDialog.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxFiltersDialog.cpp,v
retrieving revision 1.89
retrieving revision 1.90
diff -b -u -2 -r1.89 -r1.90
--- wxFiltersDialog.cpp 27 Jun 2002 13:37:46 -0000 1.89
+++ wxFiltersDialog.cpp 30 Jun 2002 23:50:15 -0000 1.90
@@ -392,4 +392,5 @@
// the spam test data
+ bool m_checkSpamAssassin:1;
bool m_check8bit:1;
bool m_checkKorean:1;
@@ -609,4 +610,7 @@
// spam details page options
+#define MP_SPAM_SPAM_ASSASSIN "SpamAssassin"
+#define MP_SPAM_SPAM_ASSASSIN_D 1l
+
#define MP_SPAM_8BIT_SUBJECT "Spam8BitSubject"
#define MP_SPAM_8BIT_SUBJECT_D 1l
@@ -632,4 +636,5 @@
{
CONFIG_NONE(),
+ CONFIG_ENTRY(MP_SPAM_SPAM_ASSASSIN),
CONFIG_ENTRY(MP_SPAM_8BIT_SUBJECT),
CONFIG_ENTRY(MP_SPAM_KOREAN_CSET),
@@ -652,8 +657,9 @@
"So the message is considered to be spam if it has..."),
wxOptionsPage::Field_Message, -1 },
+ { gettext_noop("been tagged as spam by Spam&Assassin"), wxOptionsPage::Field_Bool,
+-1 },
{ gettext_noop("Too many &8 bit characters in subject"),
wxOptionsPage::Field_Bool, -1 },
{ gettext_noop("&Korean charset"), wxOptionsPage::Field_Bool, -1 },
- { gettext_noop("X-Authentification-&Warning header"), wxOptionsPage::Field_Bool,
-1 },
- { gettext_noop("HTML content"), wxOptionsPage::Field_Bool, -1 },
+ { gettext_noop("X-Authentication-&Warning header"), wxOptionsPage::Field_Bool, -1
+},
+ { gettext_noop("&HTML content"), wxOptionsPage::Field_Bool, -1 },
#ifdef USE_RBL
{ gettext_noop("been &blacklisted by RBL"), wxOptionsPage::Field_Bool, -1},
@@ -682,4 +688,5 @@
// this is really crude but should work in common case when there is only
// one spam test in the rule
+ m_checkSpamAssassin = strstr(rule, SPAM_TEST_SPAMASSASSIN) != 0;
m_check8bit = strstr(rule, SPAM_TEST_SUBJ8BIT) != 0;
m_checkKorean = strstr(rule, SPAM_TEST_KOREAN) != 0;
@@ -701,4 +708,5 @@
// transfer data to dialog
+ profile->writeEntry(MP_SPAM_SPAM_ASSASSIN, m_checkSpamAssassin);
profile->writeEntry(MP_SPAM_8BIT_SUBJECT, m_check8bit);
profile->writeEntry(MP_SPAM_KOREAN_CSET, m_checkKorean);
@@ -711,4 +719,5 @@
if ( ShowCustomOptionsDialog(gs_SpamPageDesc, profile, GetFrame(m_Parent)) )
{
+ m_checkSpamAssassin = profile->readEntry(MP_SPAM_SPAM_ASSASSIN, 0l) != 0;
m_check8bit = profile->readEntry(MP_SPAM_8BIT_SUBJECT, 0l) != 0;
m_checkKorean = profile->readEntry(MP_SPAM_KOREAN_CSET, 0l) != 0;
@@ -727,4 +736,5 @@
// don't keep this stuff in profile, we don't use it except here
+ profile->DeleteEntry(MP_SPAM_SPAM_ASSASSIN);
profile->DeleteEntry(MP_SPAM_8BIT_SUBJECT);
profile->DeleteEntry(MP_SPAM_KOREAN_CSET);
@@ -751,4 +761,6 @@
CHECK( m_btnSpam, s, "shouldn't be called if spam button not used" );
+ if ( m_checkSpamAssassin )
+ AddToSpamArgument(s, SPAM_TEST_SPAMASSASSIN);
if ( m_check8bit )
AddToSpamArgument(s, SPAM_TEST_SUBJ8BIT);
-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
_______________________________________________
Mahogany-cvsupdates mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates
