Update of /cvsroot/mahogany/M/src/mail
In directory sc8-pr-cvs1:/tmp/cvs-serv17300/src/mail
Modified Files:
Address.cpp
Log Message:
Match List-Id correctly and ignore parameters at end of mailto
Index: Address.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/mail/Address.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -b -u -2 -r1.13 -r1.14
--- Address.cpp 17 Oct 2003 13:33:32 -0000 1.13
+++ Address.cpp 17 Oct 2003 14:36:10 -0000 1.14
@@ -343,11 +343,26 @@
if( colon != String::npos )
{
+ bool alpha = true;
+ for( size_t word = each+1; word < colon; ++word )
+ alpha &= wxIsalpha(original[word]) != 0;
+
+ if( alpha )
+ {
size_t right = original.find(_T('>'),colon);
if( right != String::npos )
{
- if( original.substr(each+1,colon-(each+1)) == _T("mailto") )
+ if( original.substr(each+1,colon-(each+1))
+ == _T("mailto") )
{
+ size_t parameters = original.find(_T('?'),colon);
+
+ size_t end;
+ if( parameters != String::npos && parameters < right )
+ end = parameters;
+ else
+ end = right;
+
result += _T('<');
- result += original.substr(colon+1,right-(colon+1));
+ result += original.substr(colon+1,end-(colon+1));
result += _T('>');
}
@@ -355,4 +370,5 @@
match = true;
each = right+1;
+ }
}
}
-------------------------------------------------------
This SF.net email sponsored by: Enterprise Linux Forum Conference & Expo
The Event For Linux Datacenter Solutions & Strategies in The Enterprise
Linux in the Boardroom; in the Front Office; & in the Server Room
http://www.enterpriselinuxforum.com
_______________________________________________
Mahogany-cvsupdates mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates
