diff -r 6b8f3b30d0ec -r efd4f1afd43e emailservices/emailframework/src/CFSMailBrand.cpp --- a/emailservices/emailframework/src/CFSMailBrand.cpp Wed Jun 09 09:22:57 2010 +0300 +++ b/emailservices/emailframework/src/CFSMailBrand.cpp Mon Jun 21 15:20:54 2010 +0300 @@ -223,16 +223,32 @@ TBool CFSMailBrand::IsMatching( const TDesC& aBrandId ) { FUNC_LOG; - + const TChar KStar = '*'; + TBool ret = EFalse; + TInt intRet = 0; TInt count = iBrandMatchStrings.Count(); - for(TInt i=0;i= 0 ) { - return ETrue; + TPtrC rightPartPtr = aBrandId.Right( aBrandId.Length()-matchPos ); + TChar isStar = brandMatchStringPtr[0]; + TInt cut = 0; + if ( isStar == KStar ) + { + cut = 1; + } + TPtrC matchString = brandMatchStringPtr.Right( brandMatchStringPtr.Length()-cut ); + intRet = rightPartPtr.CompareC( matchString ); + if ( intRet == 0 ) + { + ret = ETrue; + } } } - return EFalse; + return ret; } // -----------------------------------------------------------------------------