Merge pull request #74 from Zentyal/ejhernandez/delete-folder-on-moving

oc: Remove a source folder on move folder operation
pull/69/head
Jesús García Sáez 2015-01-22 17:06:13 +01:00
commit 7014d94937
1 changed files with 2 additions and 7 deletions

View File

@ -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];
}