amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-03-01 13:16:23 +00:00
Code Issues Projects Releases Wiki Activity

Monotone-Parent: 9f415bbce0de3939851adeff8e3f25986b8630f7

Browse Source 
Monotone-Revision: 1bf1a3f87feb2c04469fcff28770c25704ee5aab

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-08-10T14:08:40
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2012-08-10 14:08:40 +00:00
parent b13fe70beb
commit 32af60c24f
5 changed files with 49 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
OpenChange/MAPIStoreMailFolder.m
View File

@@ -1003,37 +1003,29 @@ _parseCOPYUID (NSString *line, NSArray **destUIDsP)
return MAPISTORE_SUCCESS;
}
- (enum mapistore_error) moveFolderWithFID: (uint64_t) fid
fromFolder: (MAPIStoreFolder *) sourceFolder
withNewName: (NSString *) newFolderName
- (enum mapistore_error) moveToFolder: (MAPIStoreFolder *) targetFolder
withNewName: (NSString *) newFolderName
{
enum mapistore_error rc;
MAPIStoreMailFolder *moveFolder;
NSURL *folderURL, *newFolderURL;
SOGoMailFolder *sogoMoveFolder;
SOGoMailFolder *targetSOGoFolder;
NSException *error;
if ([sourceFolder isKindOfClass: MAPIStoreMailFolderK])
if ([targetFolder isKindOfClass: MAPIStoreMailFolderK])
{
rc = [sourceFolder openFolder: &moveFolder withFID: fid];
if (rc == MAPISTORE_SUCCESS)
{
sogoMoveFolder = [moveFolder sogoObject];
folderURL = [sogoMoveFolder imap4URL];
if (!newFolderName)
newFolderName = [sogoMoveFolder nameInContainer];
newFolderURL = [NSURL URLWithString: newFolderName
relativeToURL: [sogoObject imap4URL]];
error = [[sogoMoveFolder imap4Connection]
moveMailboxAtURL: folderURL
toURL: newFolderURL];
if (error)
rc = MAPISTORE_ERR_DENIED;
else
rc = MAPISTORE_SUCCESS;
}
folderURL = [sogoObject imap4URL];
if (!newFolderName)
newFolderName = [sogoObject nameInContainer];
targetSOGoFolder = [targetFolder sogoObject];
newFolderURL = [NSURL URLWithString: newFolderName
relativeToURL: [targetSOGoFolder imap4URL]];
error = [[sogoObject imap4Connection]
moveMailboxAtURL: folderURL
toURL: newFolderURL];
if (error)
rc = MAPISTORE_ERR_DENIED;
else
rc = MAPISTORE_ERR_NOT_FOUND;
rc = MAPISTORE_SUCCESS;
}
else
rc = MAPISTORE_ERR_DENIED;