diff options
Diffstat (limited to 'libkpimidentities/identitymanager.cpp')
| -rw-r--r-- | libkpimidentities/identitymanager.cpp | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/libkpimidentities/identitymanager.cpp b/libkpimidentities/identitymanager.cpp index 4c6ed02ad..e7380ca66 100644 --- a/libkpimidentities/identitymanager.cpp +++ b/libkpimidentities/identitymanager.cpp @@ -211,7 +211,7 @@ void IdentityManager::writeConfig() const { // Also write the default identity to emailsettings KEMailSettings es; es.setSetting( KEMailSettings::RealName, (*it).fullName() ); - es.setSetting( KEMailSettings::EmailAddress, (*it).emailAddr() ); + es.setSetting( KEMailSettings::EmailAddress, (*it).primaryEmailAddress() ); es.setSetting( KEMailSettings::Organization, (*it).organization() ); es.setSetting( KEMailSettings::ReplyToAddress, (*it).replyToAddr() ); } @@ -304,16 +304,14 @@ const Identity & IdentityManager::identityForUoidOrDefault( uint uoid ) const const Identity & IdentityManager::identityForAddress( const TQString & addresses ) const { - TQStringList addressList = KPIM::splitEmailAddrList( addresses ); - for ( ConstIterator it = begin() ; it != end() ; ++it ) { - for( TQStringList::ConstIterator addrIt = addressList.begin(); - addrIt != addressList.end(); ++addrIt ) { - // I use TQString::utf8() instead of TQString::latin1() because I want - // a TQCString and not a char*. It doesn't matter because emailAddr() - // returns a 7-bit string. - if( (*it).emailAddr().lower() == - KPIM::getEmailAddress( *addrIt ).lower() ) { - return (*it); + const TQStringList addressList = KPIM::splitEmailAddrList( addresses ); + for( TQStringList::ConstIterator addrIt = addressList.begin(); + addrIt != addressList.end(); ++addrIt ) { + const TQString addr = KPIM::getEmailAddress( *addrIt ).lower(); + for ( ConstIterator it = begin() ; it != end() ; ++it ) { + const Identity & id = *it; + if ( id.matchesEmailAddress( addr ) ) { + return id; } } } @@ -499,7 +497,7 @@ TQStringList KPIM::IdentityManager::allEmails() const { TQStringList lst; for ( ConstIterator it = begin() ; it != end() ; ++it ) { - lst << (*it).emailAddr(); + lst << (*it).primaryEmailAddress(); } return lst; } |