summaryrefslogtreecommitdiffstats
path: root/kmail/accountwizard.cpp
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-09-01 00:37:02 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-09-01 00:37:02 +0000
commitcc29364f06178f8f6b457384f2ec37a042bd9d43 (patch)
tree7c77a3184c698bbf9d98cef09fb1ba8124daceba /kmail/accountwizard.cpp
parent4f6c584bacc8c3c694228f36ada3de77a76614a6 (diff)
downloadtdepim-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/accountwizard.cpp')
-rw-r--r--kmail/accountwizard.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/kmail/accountwizard.cpp b/kmail/accountwizard.cpp
index de6c43178..589ef5d63 100644
--- a/kmail/accountwizard.cpp
+++ b/kmail/accountwizard.cpp
@@ -146,7 +146,7 @@ void AccountWizard::showPage( TQWidget *page )
const KPIM::Identity &identity = manager->defaultIdentity();
mRealName->setText( identity.fullName() );
- mEMailAddress->setText( identity.emailAddr() );
+ mEMailAddress->setText( identity.primaryEmailAddress() );
mOrganization->setText( identity.organization() );
}
} else if ( page == mLoginInformationPage ) {
@@ -356,7 +356,7 @@ void AccountWizard::accept()
KPIM::Identity &identity = manager->modifyIdentityForUoid( manager->defaultIdentity().uoid() );
identity.setFullName( mRealName->text() );
- identity.setEmailAddr( mEMailAddress->text() );
+ identity.setPrimaryEmailAddress( mEMailAddress->text() );
identity.setOrganization( mOrganization->text() );
manager->commit();