From 1d6b75fa9c4e977669f7eb5c2dc83c0c3cc22965 Mon Sep 17 00:00:00 2001
From: Volker Krause <vkrause@kde.org>
Date: Mon, 18 Aug 2008 17:53:55 +0000
Subject: [PATCH] Merged revisions 842115-842659 via svnmerge from
 https://vkrause@svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim

........
  r842115 | vkrause | 2008-08-04 20:31:32 +0200 (Mon, 04 Aug 2008) | 5 lines

  Don't rewrite a just deleted folder configuration. This fixes recreation
  of a just deleted folder.

  Kolab issue 2933
........
  r842659 | vkrause | 2008-08-05 20:13:00 +0200 (Tue, 05 Aug 2008) | 7 lines

  Don't try to delete the job again if the error handling code already
  killed all of them. Fixes a crash when copying a message into a
  read-only folder before we know it actually is read-only and selecting
  cancel in the subsequent error dialog.

  Kolab issue 2850
........

svn path=/branches/KDE/3.5/kdepim/; revision=848912
---
 imapjob.cpp            | 4 ++--
 kmfoldercachedimap.cpp | 5 +++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/imapjob.cpp b/imapjob.cpp
index 8956a986e..13d4baa84 100644
--- a/imapjob.cpp
+++ b/imapjob.cpp
@@ -650,8 +650,8 @@ void ImapJob::slotCopyMessageResult( KIO::Job *job )
     QString errStr = i18n("Error while copying messages.");
     if ( (*it).progressItem )
       (*it).progressItem->setStatus( errStr );
-    account->handleJobError( job, errStr  );
-    deleteLater();
+    if ( account->handleJobError( job, errStr  ) )
+      deleteLater();
     return;
   } else {
     if ( !(*it).msgList.isEmpty() )
diff --git a/kmfoldercachedimap.cpp b/kmfoldercachedimap.cpp
index 6d1c45758..5a3140778 100644
--- a/kmfoldercachedimap.cpp
+++ b/kmfoldercachedimap.cpp
@@ -301,6 +301,11 @@ void KMFolderCachedImap::readConfig()
 
 void KMFolderCachedImap::writeConfig()
 {
+  // don't re-write the config of a removed folder, this has just been deleted in
+  // the folder manager
+  if ( mFolderRemoved )
+    return;
+
   KConfigGroup configGroup( KMKernel::config(), "Folder-" + folder()->idString() );
   configGroup.writeEntry( "ImapPath", mImapPath );
   configGroup.writeEntry( "NoContent", mNoContent );