Merged revisions 918208 via svnmerge from

svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.2/kdepim

........
  r918208 | tmcguire | 2009-01-29 17:41:35 +0100 (Thu, 29 Jan 2009) | 7 lines
  
  Backport r914151 by tmcguire from trunk to the 4.2 branch:
  
  Don't ask for the wallet on exit if the password is not dirty.
  
  CCBUG: 163413
........

svn path=/branches/kdepim/enterprise4/kdepim/; revision=918336

networkaccount.cpp

@@ -205,16 +205,16 @@ namespace KMail {
 
       //If the password should be written to the wallet, do that
       if ( !mStorePasswdInConfig ) {
-        Wallet *wallet = kmkernel->wallet();
 
         //If the password is dirty, try to store it in the wallet
         if ( mPasswdDirty ) {
+          Wallet *wallet = kmkernel->wallet();
           if ( wallet && wallet->writePassword( "account-" + QString::number(mId), passwd() ) == 0 )
             passwdStored = true;
         }
 
         //If the password isn't dirty, it is already stored in the wallet.
-        else if ( wallet )
+        else
           passwdStored = true;
 
         //If the password is stored in the wallet, it isn't dirty or stored in the config