* 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, 11 insertions, 5 deletions

diff --git a/wizards/kmailchanges.cpp b/wizards/kmailchanges.cpp
index ca2969a51..79e06f585 100644
--- a/wizards/kmailchanges.cpp
+++ b/wizards/kmailchanges.cpp
@@ -243,10 +243,11 @@ void CreateDisconnectedImapAccount::apply()
   c.setGroup( TQString("Folder-%1").arg( uid ) );
   c.writeEntry( "isOpen", true );
 
-  if ( mEnableSavePassword ) {
-    c.writeEntry( "pass", KStringHandler::obscure( mPassword ) );
-    c.writeEntry( "store-passwd", true );
-  }
+  c.setGroup(  "AccountWizard"  );
+  c.writeEntry(  "ShowOnStartup" , false );
+
+  c.setGroup( "Composer" );
+  c.writeEntry( "default-transport", mAccountName );
 
   c.setGroup( TQString("Transport %1").arg( transportId ) );
   c.writeEntry( "name", mAccountName );
@@ -295,7 +296,7 @@ void CreateDisconnectedImapAccount::apply()
 
     KPIM::Identity& identity = identityManager.newFromScratch( accountName );
     identity.setFullName( mRealName );
-    identity.setEmailAddr( mEmail );
+    identity.setPrimaryEmailAddress( mEmail );
     identityManager.commit();
   }
 
@@ -360,6 +361,11 @@ void CreateOnlineImapAccount::apply()
 
   c.setGroup( TQString("Folder-%1").arg( uid ) );
   c.writeEntry( "isOpen", true );
+
+
+  c.setGroup(  "AccountWizard" );
+  c.writeEntry(  "ShowOnStartup" , false );
+
 }
 
 bool CreateImapAccount::writeToWallet(const TQString & type, int id)