amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-03-06 07:36:24 +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

37
OpenChange/MAPIStoreSOGo.m
View File

@@ -609,11 +609,11 @@ sogo_folder_move_copy_messages(void *folder_object,
}
static enum mapistore_error
sogo_folder_move_folder(void *folder_object, void *source_folder_object,
uint64_t fid, const char *new_folder_name)
sogo_folder_move_folder(void *folder_object, void *target_folder_object,
const char *new_folder_name)
{
MAPIStoreFolder *sourceFolder, *targetFolder;
NSAutoreleasePool *pool;
MAPIStoreFolder *moveFolder, *targetFolder;
NSString *newFolderName;
struct MAPIStoreTallocWrapper *wrapper;
int rc;
@@ -623,10 +623,10 @@ sogo_folder_move_folder(void *folder_object, void *source_folder_object,
if (folder_object)
{
wrapper = folder_object;
targetFolder = wrapper->instance;
moveFolder = wrapper->instance;
wrapper = source_folder_object;
sourceFolder = wrapper->instance;
wrapper = target_folder_object;
targetFolder = wrapper->instance;
GSRegisterCurrentThread ();
pool = [NSAutoreleasePool new];
@@ -636,9 +636,8 @@ sogo_folder_move_folder(void *folder_object, void *source_folder_object,
else
newFolderName = nil;
rc = [targetFolder moveFolderWithFID: fid
fromFolder: sourceFolder
withNewName: newFolderName];
rc = [moveFolder moveToFolder: targetFolder
withNewName: newFolderName];
[pool release];
GSUnregisterCurrentThread ();
}
@@ -651,12 +650,11 @@ sogo_folder_move_folder(void *folder_object, void *source_folder_object,
}
static enum mapistore_error
sogo_folder_copy_folder(void *folder_object, void *source_folder_object,
uint64_t fid, bool recursive,
const char *new_folder_name)
sogo_folder_copy_folder(void *folder_object, void *target_folder_object,
bool recursive, const char *new_folder_name)
{
MAPIStoreFolder *sourceFolder, *targetFolder;
NSAutoreleasePool *pool;
MAPIStoreFolder *copyFolder, *targetFolder;
NSString *newFolderName;
struct MAPIStoreTallocWrapper *wrapper;
int rc;
@@ -666,20 +664,19 @@ sogo_folder_copy_folder(void *folder_object, void *source_folder_object,
if (folder_object)
{
wrapper = folder_object;
targetFolder = wrapper->instance;
copyFolder = wrapper->instance;
wrapper = source_folder_object;
sourceFolder = wrapper->instance;
wrapper = target_folder_object;
targetFolder = wrapper->instance;
GSRegisterCurrentThread ();
pool = [NSAutoreleasePool new];
newFolderName = [NSString stringWithUTF8String: new_folder_name];
rc = [targetFolder copyFolderWithFID: fid
fromFolder: sourceFolder
recursive: recursive
withNewName: newFolderName];
rc = [copyFolder copyToFolder: targetFolder
recursive: recursive
withNewName: newFolderName];
[pool release];
GSUnregisterCurrentThread ();
}