diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-09-01 00:37:02 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-09-01 00:37:02 +0000 |
| commit | cc29364f06178f8f6b457384f2ec37a042bd9d43 (patch) | |
| tree | 7c77a3184c698bbf9d98cef09fb1ba8124daceba /kmail/kmsender.cpp | |
| parent | 4f6c584bacc8c3c694228f36ada3de77a76614a6 (diff) | |
| download | tdepim-cc29364f06178f8f6b457384f2ec37a042bd9d43.tar.gz tdepim-cc29364f06178f8f6b457384f2ec37a042bd9d43.zip | |
* Massive set of changes to bring in all fixes and enhancements from the Enterprise PIM branch
* Ensured that the Trinity changes were applied on top of those enhancements, and any redundancy removed
* Added journal read support to the CalDAV resource
* Fixed CalDAV resource to use events URL for tasks and journals when separate URL checkbox unchecked
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1170461 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kmail/kmsender.cpp')
| -rw-r--r-- | kmail/kmsender.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/kmail/kmsender.cpp b/kmail/kmsender.cpp index a79da268..7f7730da 100644 --- a/kmail/kmsender.cpp +++ b/kmail/kmsender.cpp @@ -317,6 +317,7 @@ void KMSender::doSendMsg() mCurrentMsg->setStatus(KMMsgStatusSent); mCurrentMsg->setStatus(KMMsgStatusRead); // otherwise it defaults to new on imap mCurrentMsg->updateAttachmentState(); + mCurrentMsg->updateInvitationState(); const KPIM::Identity & id = kmkernel->identityManager() ->identityForUoidOrDefault( mCurrentMsg->headerField( "X-KMail-Identity" ).stripWhiteSpace().toUInt() ); @@ -421,10 +422,10 @@ void KMSender::doSendMsg() // empty const KPIM::Identity & id = kmkernel->identityManager() ->identityForUoidOrDefault( mCurrentMsg->headerField( "X-KMail-Identity" ).stripWhiteSpace().toUInt() ); - if ( !id.emailAddr().isEmpty() ) { + if ( !id.primaryEmailAddress().isEmpty() ) { mCurrentMsg->setFrom( id.fullEmailAddr() ); } - else if ( !kmkernel->identityManager()->defaultIdentity().emailAddr().isEmpty() ) { + else if ( !kmkernel->identityManager()->defaultIdentity().primaryEmailAddress().isEmpty() ) { mCurrentMsg->setFrom( kmkernel->identityManager()->defaultIdentity().fullEmailAddr() ); } else { |