1 files changed, 15 insertions, 10 deletions

diff --git a/kmail/networkaccount.cpp b/kmail/networkaccount.cpp
index 9a5f5e993..ab432557b 100644
--- a/kmail/networkaccount.cpp
+++ b/kmail/networkaccount.cpp
@@ -55,7 +55,7 @@ namespace KMail {
       mAuth( "*" ),
       mPort( 0 ),
       mStorePasswd( false ),
-      mUseSSL( false ),
+      mUseSTARTTLS( false ),
       mUseTLS( false ),
       mAskAgain( false ),
       mPasswdDirty( false ),
@@ -78,7 +78,7 @@ namespace KMail {
     mHost = TQString();
     mPort = defaultPort();
     mStorePasswd = false;
-    mUseSSL = false;
+    mUseSTARTTLS = false;
     mUseTLS = false;
     mAskAgain = false;
   }
@@ -129,8 +129,8 @@ namespace KMail {
     mPort = port;
   }
 
-  void NetworkAccount::setUseSSL( bool use ) {
-    mUseSSL = use;
+  void NetworkAccount::setUseSTARTTLS( bool use ) {
+    mUseSTARTTLS = use;
   }
 
   void NetworkAccount::setUseTLS( bool use ) {
@@ -189,8 +189,10 @@ namespace KMail {
     setPort( port );
 
     setAuth( config.readEntry( "auth", "*" ) );
-    setUseSSL( config.readBoolEntry( "use-ssl", false ) );
-    setUseTLS( config.readBoolEntry( "use-tls", false ) );
+    // TODO(mio): Write an upgrade script to rename "use-tls" to "use-starttls".
+    setUseSTARTTLS( config.readBoolEntry( "use-tls", false ) );
+    // TODO(mio): Write an upgrade script to rename "use-ssl" to "use-tls".
+    setUseTLS( config.readBoolEntry( "use-ssl", false ));
 
     mSieveConfig.readConfig( config );
   }
@@ -245,8 +247,10 @@ namespace KMail {
     config.writeEntry( "host", host() );
     config.writeEntry( "port", static_cast<unsigned int>( port() ) );
     config.writeEntry( "auth", auth() );
-    config.writeEntry( "use-ssl", useSSL() );
-    config.writeEntry( "use-tls", useTLS() );
+    // TODO(mio): Write an upgrade script to rename "use-tls" to "use-starttls".
+    config.writeEntry( "use-tls", useSTARTTLS() );
+    // TODO(mio): Write an upgrade script to rename "use-ssl" to "use-tls".
+    config.writeEntry( "use-ssl", useTLS() );
 
     mSieveConfig.writeConfig( config );
   }
@@ -269,7 +273,8 @@ namespace KMail {
 
   MetaData NetworkAccount::slaveConfig() const {
     MetaData m;
-    m.insert( "tls", useTLS() ? "on" : "off" );
+    // COMPAT: To keep compatibility with the IOSlaves, we use "tls" for STARTTLS.
+    m.insert( "tls", useSTARTTLS() ? "on" : "off" );
     return m;
   }
 
@@ -284,7 +289,7 @@ namespace KMail {
     setHost( n->host() );
     setPort( n->port() );
     setAuth( n->auth() );
-    setUseSSL( n->useSSL() );
+    setUseSTARTTLS( n->useSTARTTLS() );
     setUseTLS( n->useTLS() );
     setSieveConfig( n->sieveConfig() );
   }