mirror of
https://github.com/inverse-inc/sogo.git
synced 2026-05-26 05:45:24 +00:00
merge of '119376c6d87a7be6c3b6c2b3d6329f6b8d60b461'
and '37a89f2c11d5ea6e9541a6dae8f2ad9aeb88393a' Monotone-Parent: 119376c6d87a7be6c3b6c2b3d6329f6b8d60b461 Monotone-Parent: 37a89f2c11d5ea6e9541a6dae8f2ad9aeb88393a Monotone-Revision: 79dc6e23f29ab39ef98de2d45f1c37249b3c4152 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2011-07-13T21:38:19 Monotone-Branch: ca.inverse.sogo
This commit is contained in:
@@ -17,6 +17,9 @@
|
||||
|
||||
2011-07-13 Wolfgang Sourdeau <wsourdeau@inverse.ca>
|
||||
|
||||
* OpenChange/NSObject+MAPIStore.m (MAPIStoreTallocWrapperDestroy):
|
||||
the object release now occurs within an NSAutoreleasePool.
|
||||
|
||||
* Tools/sogo-tool.m (main): instantiate SOGoSystemDefaults in
|
||||
order to properly inject the entries from SOGoDefaults.plist.
|
||||
|
||||
|
||||
@@ -20,6 +20,7 @@
|
||||
* Boston, MA 02111-1307, USA.
|
||||
*/
|
||||
|
||||
#import <Foundation/NSAutoreleasePool.h>
|
||||
#import <NGExtensions/NSObject+Logs.h>
|
||||
|
||||
#import "NSData+MAPIStore.h"
|
||||
@@ -37,10 +38,13 @@
|
||||
static int MAPIStoreTallocWrapperDestroy (void *data)
|
||||
{
|
||||
struct MAPIStoreTallocWrapper *wrapper;
|
||||
NSAutoreleasePool *pool;
|
||||
|
||||
pool = [NSAutoreleasePool new];
|
||||
wrapper = data;
|
||||
NSLog (@"destroying wrapped object (wrapper: %p; object: %p...\n", wrapper, wrapper->MAPIStoreSOGoObject);
|
||||
NSLog (@"destroying wrapped object (wrapper: %p; object: %p)...\n", wrapper, wrapper->MAPIStoreSOGoObject);
|
||||
[wrapper->MAPIStoreSOGoObject release];
|
||||
[pool release];
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user