From 0716c41fe7a27ebeb275c8c7de920ef71837d5b5 Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Wed, 13 Jul 2011 21:38:14 +0000 Subject: [PATCH] Monotone-Parent: e3a0cebd32124aa09d35255a3e302efd4805257e Monotone-Revision: 37a89f2c11d5ea6e9541a6dae8f2ad9aeb88393a Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2011-07-13T21:38:14 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 3 +++ OpenChange/NSObject+MAPIStore.m | 6 +++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 3cf1de4c4..db55c6eca 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,6 +9,9 @@ 2011-07-13 Wolfgang Sourdeau + * 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. diff --git a/OpenChange/NSObject+MAPIStore.m b/OpenChange/NSObject+MAPIStore.m index f84598715..7caaa0e65 100644 --- a/OpenChange/NSObject+MAPIStore.m +++ b/OpenChange/NSObject+MAPIStore.m @@ -20,6 +20,7 @@ * Boston, MA 02111-1307, USA. */ +#import #import #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; }