diff -r 518b245aa84c -r 4e4b6adb1024 messagingapp/msgui/unifiededitor/src/msgunieditorview.cpp --- a/messagingapp/msgui/unifiededitor/src/msgunieditorview.cpp Fri Jun 25 15:47:40 2010 +0530 +++ b/messagingapp/msgui/unifiededitor/src/msgunieditorview.cpp Tue Jun 29 23:42:47 2010 +0530 @@ -49,7 +49,7 @@ #include #include #include - +#include // Common phone number validity checker // USER INCLUDES #include "debugtraces.h" @@ -943,7 +943,13 @@ mToField->addresses(removeDuplicates); ConvergedMessageAddressList ccAddresses; ConvergedMessageAddressList bccAddresses; - + + //Don't format the addresses for save to drfats case + if(!isSave) + { + formatAddresses(addresses); + } + msg.addToRecipients(addresses); msg.setBodyText(mBody->text()); msg.setDirection(ConvergedMessage::Outgoing); @@ -1002,10 +1008,20 @@ if(ccAddresses.count()>0) { + //Don't format the addresses for save to drfats case + if(!isSave) + { + formatAddresses(ccAddresses); + } msg.addCcRecipients(ccAddresses); } if(bccAddresses.count()>0) { + //Don't format the addresses for save to drfats case + if(!isSave) + { + formatAddresses(bccAddresses); + } msg.addBccRecipients(bccAddresses); } if(mSubjectField) @@ -1661,4 +1677,32 @@ } } +// ---------------------------------------------------------------------------- +// MsgUnifiedEditorView::formatAddresses +// @see header +// ---------------------------------------------------------------------------- +void MsgUnifiedEditorView::formatAddresses( + ConvergedMessageAddressList& addresses) +{ + + for(int i=0; i < addresses.count() ;i++ ) + { + QString addr = addresses[i]->address(); + + HBufC *tempAddr = XQConversions::qStringToS60Desc(addr); + + TPtr ptr = tempAddr->Des(); + + // Note: This is just to parse spaces etc away from phonenumbers. + // Ignore EFalse returned for email addresses. + CommonPhoneParser::ParsePhoneNumber(ptr , + CommonPhoneParser::ESMSNumber ); + + addr = XQConversions::s60DescToQString(tempAddr->Des()); + + addresses[i]->setAddress(addr); + + delete tempAddr; + } +} //EOF