Update of /cvsroot/mahogany/M/src/modules
In directory sc8-pr-cvs1:/tmp/cvs-serv533/src/modules
Modified Files:
Filters.cpp
Log Message:
Ignore local part in whitelist
Index: Filters.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/modules/Filters.cpp,v
retrieving revision 1.167
retrieving revision 1.168
diff -b -u -2 -r1.167 -r1.168
--- Filters.cpp 16 Oct 2003 12:17:10 -0000 1.167
+++ Filters.cpp 16 Oct 2003 15:15:46 -0000 1.168
@@ -2336,9 +2336,10 @@
wxArrayString values = msg->GetHeaderLines(headers);
wxString list = strutil_flatten_array(values, ',');
- list.MakeLower();
+ RefCounter<AddressList> parser(AddressList::Create(list));
AdbManager *manager = AdbManager::Get();
manager->LoadAll(); // HACK: So that AdbEditor's provider list is utilized
- AdbBook *book = manager->CreateBook(READ_APPCONFIG_TEXT(MP_WHITE_LIST));
+ RefCounter<AdbBook> book(
+ manager->CreateBook(READ_APPCONFIG_TEXT(MP_WHITE_LIST)));
manager->Unget();
@@ -2347,18 +2348,19 @@
bool found = false;
+ for( Address *candidate = parser->GetFirst(); candidate;
+ candidate = parser->GetNext(candidate) )
+ {
for( size_t each = 0; each < names.GetCount(); ++each )
{
- AdbEntry *entry = book->GetEntry(names[each]);
-
- wxString address;
- entry->GetField(AdbField_EMail,&address);
- address.MakeLower();
+ RefCounter<AdbEntry> entry(book->GetEntry(names[each]));
- found = found || list.find(address) != wxString::npos;
-
- entry->DecRef();
+ // FIXME: Grammar without escape sequences
+ if( entry->Matches(String(_T("*@"))+candidate->GetDomain(),
+ AdbLookup_EMail,AdbLookup_Match) )
+ {
+ found = true;
+ }
+ }
}
-
- book->DecRef();
return !found;
-------------------------------------------------------
This SF.net email is sponsored by: SF.net Giveback Program.
SourceForge.net hosts over 70,000 Open Source Projects.
See the people who have HELPED US provide better services:
Click here: http://sourceforge.net/supporters.php
_______________________________________________
Mahogany-cvsupdates mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates
