[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdepim/wizards
From:       Kevin Ottens <ervin () kde ! org>
Date:       2008-04-10 8:44:30
Message-ID: 1207817070.575577.720.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 795405 by ervin:

Ensure the wizards use mailtransport to store the transports
information, and also the right wallet folder for the password.


 M  +15 -5     kmailchanges.cpp  


--- trunk/KDE/kdepim/wizards/kmailchanges.cpp #795404:795405
@@ -248,7 +248,8 @@
     group.writeEntry( "store-passwd", true );
   }
 
-  group = c.group( QString("Transport %1").arg( transportId ) );
+  KConfig transport( "mailtransports" );
+  group = transport.group( QString("Transport %1").arg( transportId ) );
   group.writeEntry( "name", mAccountName );
   group.writeEntry( "host", mServer );
   group.writeEntry( "type", "smtp" );
@@ -264,6 +265,7 @@
   } else if ( mAuthenticationSend == LOGIN ) {
     group.writeEntry( "authtype", "LOGIN" );
   }
+  group.writeEntry( "id", transportId );
   group.writeEntry( "user", mUser );
   if ( mEnableSavePassword ) {
     if ( !writeToWallet( "transport", transportId ) ) {
@@ -374,9 +376,17 @@
     mWallet = Wallet::openWallet( Wallet::NetworkWallet(), window );
     if ( !mWallet )
       return false;
-    if ( !mWallet->hasFolder( "kmail" ) )
-      mWallet->createFolder( "kmail" );
-    mWallet->setFolder( "kmail" );
   }
-  return mWallet->writePassword( type + '-' + QString::number( id ), mPassword );
+  QString folder, str_id;
+  if ( type=="transport" ) {
+    folder = "mailtransports";
+    str_id = QString::number( id );
+  } else {
+    folder = "kmail";
+    str_id = type + '-' + QString::number( id );
+  }
+  if ( !mWallet->hasFolder( folder ) )
+    mWallet->createFolder( folder );
+  mWallet->setFolder( folder );
+  return mWallet->writePassword( str_id, mPassword );
 }
[prev in list] [next in list] [prev in thread] [next in thread]