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

List:       kde-commits
Subject:    kdepim/kmail
From:       Till Adam <adam () kde ! org>
Date:       2003-11-01 12:37:53
[Download RAW message or body]

CVS commit by tilladam: 

Don't crash on leaving the account config dialog if there is a bogus
trash folder set. This can happen if the trash folder has gone away on
the server. Set the trash to the local system trash folder in that case.


  M +5 -1      accountdialog.cpp   1.132


--- kdepim/kmail/accountdialog.cpp  #1.131:1.132
@@ -1394,5 +1394,9 @@ void AccountDialog::saveSettings()
     epa.setStorePasswd( mImap.storePasswordCheck->isChecked() );
     epa.setPasswd( mImap.passwordEdit->text(), epa.storePasswd() );
+    KMFolder *t = mImap.trashCombo->getFolder();
+    if ( t )
     epa.setTrash( mImap.trashCombo->getFolder()->idString() );
+    else
+      epa.setTrash( kmkernel->trashFolder()->idString() );
     epa.setResource( mImap.resourceCheck->isChecked() );
     epa.setCheckExclude( mImap.excludeCheck->isChecked() );


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