From 99a36be03403ced16f6c3952a4086252fdc3f7e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Enrique=20J=2E=20Hern=C3=A1ndez=20Blasco?= Date: Wed, 21 Jan 2015 12:44:31 +0100 Subject: [PATCH] oc: Remove a source folder on move folder operation Calling deleteFolder message to actually remove it from DB/IMAP depending on the class. --- OpenChange/MAPIStoreFolder.m | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/OpenChange/MAPIStoreFolder.m b/OpenChange/MAPIStoreFolder.m index a939b9610..5aa59f8c4 100644 --- a/OpenChange/MAPIStoreFolder.m +++ b/OpenChange/MAPIStoreFolder.m @@ -449,16 +449,11 @@ Class NSExceptionK, MAPIStoreFAIMessageK, MAPIStoreMessageTableK, MAPIStoreFAIMe return rc; } -- (void) deleteFolderImpl +- (int) deleteFolder { // TODO: raise exception in case underlying delete fails? // [propsMessage delete]; [dbFolder delete]; -} - -- (int) deleteFolder -{ - [self deleteFolderImpl]; [self cleanupCaches]; @@ -924,7 +919,7 @@ Class NSExceptionK, MAPIStoreFAIMessageK, MAPIStoreMessageTableK, MAPIStoreFAIMe { fmid = [mapping idFromURL: [self url]]; [mapping unregisterURLWithID: fmid]; - [self deleteFolderImpl]; + [self deleteFolder]; [mapping registerURL: [newFolder url] withID: fmid]; }