* 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

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();