LupusNobilis/sogo
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

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

Browse source 
oc: Remove a source folder on move folder operation
This commit is contained in:
Jesús García Sáez 2015-01-22 17:06:13 +01:00
parent 8e41e5d665 99a36be034
commit 7014d94937
1 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
OpenChange/MAPIStoreFolder.m
View file

@ -449,16 +449,11 @@ Class NSExceptionK, MAPIStoreFAIMessageK, MAPIStoreMessageTableK, MAPIStoreFAIMe
return rc; return rc;
} }
- (void) deleteFolderImpl - (int) deleteFolder
{ {
// TODO: raise exception in case underlying delete fails? // TODO: raise exception in case underlying delete fails?
// [propsMessage delete]; // [propsMessage delete];
[dbFolder delete]; [dbFolder delete];
}
- (int) deleteFolder
{
[self deleteFolderImpl];
[self cleanupCaches]; [self cleanupCaches];
@ -924,7 +919,7 @@ Class NSExceptionK, MAPIStoreFAIMessageK, MAPIStoreMessageTableK, MAPIStoreFAIMe
{ {
fmid = [mapping idFromURL: [self url]]; fmid = [mapping idFromURL: [self url]];
[mapping unregisterURLWithID: fmid]; [mapping unregisterURLWithID: fmid];
[self deleteFolderImpl]; [self deleteFolder];
[mapping registerURL: [newFolder url] [mapping registerURL: [newFolder url]
withID: fmid]; withID: fmid];
} }