Monotone-Parent: 1036da510d0360f1e473b578044e95ac7792871f

Monotone-Revision: 0a2405280c040b602d25fea256f5093976a1aa95

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-08-14T20:16:16
Monotone-Branch: ca.inverse.sogo
maint-2.0.2
Wolfgang Sourdeau 2012-08-14 20:16:16 +00:00
parent 992c95f9a0
commit 5426fb4bbb
2 changed files with 8 additions and 1 deletions

View File

@ -1,5 +1,9 @@
2012-08-14 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* OpenChange/MAPIStoreSOGo.m (sogo_folder_move_folder): if
"target_folder_object", we do not attempt to access the
corresponding instance member.
* OpenChange/MAPIStoreMailFolder.m (-
moveCopyMessagesWithMIDs:andCount:fromFolder:withMIDs:andChangeKeys:wantCopy:):
do not attempt to access targetChangeKeys when NULL, to avoid a

View File

@ -626,7 +626,10 @@ sogo_folder_move_folder(void *folder_object, void *target_folder_object,
moveFolder = wrapper->instance;
wrapper = target_folder_object;
targetFolder = wrapper->instance;
if (wrapper)
targetFolder = wrapper->instance;
else
targetFolder = nil;
GSRegisterCurrentThread ();
pool = [NSAutoreleasePool new];