Update of /cvsroot/mahogany/M/src/gui
In directory usw-pr-cvs1:/tmp/cvs-serv22698/src/gui
Modified Files:
wxFiltersDialog.cpp
Log Message:
yet another correction to the initial values of the spam dialog checkboxes
Index: wxFiltersDialog.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxFiltersDialog.cpp,v
retrieving revision 1.95
retrieving revision 1.96
diff -b -u -2 -r1.95 -r1.96
--- wxFiltersDialog.cpp 13 Aug 2002 11:32:40 -0000 1.95
+++ wxFiltersDialog.cpp 6 Sep 2002 16:35:13 -0000 1.96
@@ -701,5 +701,11 @@
OneCritControl::InitSpamOptions(const String& rule)
{
+ CHECK_RET( m_Argument, "no argument control in the spam test?" );
+
+ const String testString = m_Argument->GetValue();
+
// use the default values to initialize the dialog
+ if ( testString.empty() )
+ {
m_checkSpamAssassin = MP_SPAM_SPAM_ASSASSIN_D;
m_check8bit = MP_SPAM_8BIT_SUBJECT_D;
@@ -714,4 +720,47 @@
m_checkRBL = MP_SPAM_RBL_D;
#endif // USE_RBL
+ }
+ else // extract the tests we do from the actual value
+ {
+#ifdef USE_RBL
+ m_checkRBL =
+#endif // USE_RBL
+
+ m_checkSpamAssassin =
+ m_check8bit =
+ m_checkCaps =
+ m_checkKorean =
+
+ m_checkXAuthWarn =
+ m_checkReceived =
+ m_checkHtml = false;
+
+ const wxArrayString tests = strutil_restore_array(testString);
+ const size_t count = tests.GetCount();
+ for ( size_t n = 0; n < count; n++ )
+ {
+ const wxString& t = tests[n];
+ if ( t == SPAM_TEST_SPAMASSASSIN )
+ m_checkSpamAssassin = true;
+ else if ( t == SPAM_TEST_SUBJ8BIT )
+ m_check8bit = true;
+ else if ( t == SPAM_TEST_SUBJCAPS )
+ m_checkCaps = true;
+ else if ( t == SPAM_TEST_KOREAN )
+ m_checkKorean = true;
+ else if ( t == SPAM_TEST_XAUTHWARN )
+ m_checkXAuthWarn = true;
+ else if ( t == SPAM_TEST_RECEIVED )
+ m_checkReceived = true;
+ else if ( t == SPAM_TEST_HTML )
+ m_checkHtml = true;
+#ifdef USE_RBL
+ else if ( t == SPAM_TEST_RBL )
+ m_checkReceived = true;
+#endif
+ else
+ wxLogDebug("Unknown spam test \"%s\"", t.c_str());
+ }
+ }
}
-------------------------------------------------------
This sf.net email is sponsored by: OSDN - Tired of that same old
cell phone? Get a new here for FREE!
https://www.inphonic.com/r.asp?r=sourceforge1&refcode1=vs3390
_______________________________________________
Mahogany-cvsupdates mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates
