Merge ...

SVN commit 630633 by dfaure:

When not using kwallet, kmail can store the smtp password into kmailrc, which works,
but for every mail sent after that it asked again: do you want to store the password into the config file? -> fixed


svn path=/branches/kdepim/enterprise/kdepim/; revision=665683

kmtransport.cpp

@@ -126,15 +126,15 @@ void KMTransportInfo::writeConfig(int id)
   if ( storePasswd() ) {
     // write password into the wallet if possible and necessary
     bool passwdStored = false;
+    Wallet *wallet = kmkernel->wallet();
     if ( mPasswdDirty ) {
-      Wallet *wallet = kmkernel->wallet();
       if ( wallet && wallet->writePassword( "transport-" + QString::number(mId), passwd() ) == 0 ) {
         passwdStored = true;
         mPasswdDirty = false;
         mStorePasswdInConfig = false;
       }
     } else {
-      passwdStored = !mStorePasswdInConfig; // already in the wallet
+      passwdStored = wallet ? !mStorePasswdInConfig /*already in the wallet*/ : config->hasKey("pass");
     }
     // wallet not available, ask the user if we should use the config file instead
     if ( !passwdStored && ( mStorePasswdInConfig ||  KMessageBox::warningYesNo( 0,