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

List:       kde-commits
Subject:    [kdepim-runtime/KDE/4.8] resources/imap: Better error handling when a not-existing folder is request
From:       Andras Mantia <amantia () kde ! org>
Date:       2012-02-29 22:01:28
Message-ID: 20120229220128.E543AA60A9 () git ! kde ! org
[Download RAW message or body]

Git commit d7fc7f2486304e9b0b0db2d979bcb245b259a85f by Andras Mantia.
Committed on 29/02/2012 at 23:01.
Pushed by amantia into branch 'KDE/4.8'.

Better error handling when a not-existing folder is requested to be deleted.
This fix avoids the resource being stuck in change processing if the above =
conditions
is hit.

(backport from master with a different string, no new i18n)

M  +9    -0    resources/imap/removecollectionrecursivetask.cpp

http://commits.kde.org/kdepim-runtime/d7fc7f2486304e9b0b0db2d979bcb245b259a=
85f

diff --git a/resources/imap/removecollectionrecursivetask.cpp b/resources/i=
map/removecollectionrecursivetask.cpp
index 9e78cff..ca3749b 100644
--- a/resources/imap/removecollectionrecursivetask.cpp
+++ b/resources/imap/removecollectionrecursivetask.cpp
@@ -69,6 +69,15 @@ void RemoveCollectionRecursiveTask::onMailBoxesReceived(=
 const QList< KIMAP::Mai
     }
   }
 =

+  if  ( foldersToDelete.isEmpty() ) {
+      changeProcessed();
+
+      kDebug(5327) << "Failed to delete the folder, resync the folder tree=
";
+      emitWarning( i18n( "Failed to delete the folder, restoring folder li=
st." ) );
+      synchronizeCollectionTree();
+      return;
+  }
+
   // Now start the actual deletion work
   QMapIterator<int, QList<KIMAP::MailBoxDescriptor> > it( foldersToDelete =
);
   it.toBack(); // we start with largest nesting value first
[prev in list] [next in list] [prev in thread] [next in thread]