* 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, 4 deletions

diff --git a/kmail/vacation.cpp b/kmail/vacation.cpp
index d0cdedf85..0b9222f48 100644
--- a/kmail/vacation.cpp
+++ b/kmail/vacation.cpp
@@ -500,11 +500,15 @@ namespace KMail {
       u.setUser( a->login() );
       u.setPass( a->passwd() );
       u.setPort( sieve.port() );
-      u.setQuery( "x-mech=" + (a->auth() == "*" ? "PLAIN" : a->auth()) ); //translate IMAP LOGIN to PLAIN
+      u.addQueryItem( "x-mech", a->auth() == "*" ? "PLAIN" : a->auth() ); //translate IMAP LOGIN to PLAIN
+      if ( !a->useSSL() && !a->useTLS() )
+          u.addQueryItem( "x-allow-unencrypted", "true" );
       u.setFileName( sieve.vacationFileName() );
       return u;
     } else {
       KURL u = sieve.alternateURL();
+      if ( u.protocol().lower() == "sieve" && !a->useSSL() && !a->useTLS() && u.queryItem("x-allow-unencrypted").isEmpty() )
+          u.addQueryItem( "x-allow-unencrypted", "true" );
       u.setFileName( sieve.vacationFileName() );
       return u;
     }
@@ -579,9 +583,11 @@ namespace KMail {
   TQStringList Vacation::defaultMailAliases() {
     TQStringList sl;
     for ( KPIM::IdentityManager::ConstIterator it = kmkernel->identityManager()->begin() ;
-	  it != kmkernel->identityManager()->end() ; ++it )
-      if ( !(*it).emailAddr().isEmpty() )
-	sl.push_back( (*it).emailAddr() );
+	  it != kmkernel->identityManager()->end() ; ++it ) {
+      if ( !(*it).primaryEmailAddress().isEmpty() )
+	sl.push_back( (*it).primaryEmailAddress() );
+      sl += (*it).emailAliases();
+    }
     return sl;
   }
 
@@ -666,6 +672,7 @@ namespace KMail {
     mDialog->setMailAliases( defaultMailAliases().join(", ") );
     mDialog->setSendForSpam( defaultSendForSpam() );
     mDialog->setDomainName( defaultDomainName() );
+    mDialog->setDomainCheck( false );
   }
 
   void Vacation::slotDialogOk() {