Monotone-Parent: aff0225cae26a70d3ca711bd22d7459655c7f24e

Monotone-Revision: 39e4d66894e1c585c6ce895bdcf629c4e6c0999e

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2011-07-08T20:05:50
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau 2011-07-08 20:05:50 +00:00
parent fcc4b2b070
commit 5c044411d4
5 changed files with 20 additions and 16 deletions

View file

@ -1,5 +1,8 @@
2011-07-08 Wolfgang Sourdeau <wsourdeau@inverse.ca> 2011-07-08 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* OpenChange/MAPIStoreObject.m (-setMAPIRetainCount:)
(-mapiRetainCount:): moved methods from MAPIStoreMessage.
* OpenChange/MAPIStoreTable.m * OpenChange/MAPIStoreTable.m
(-evaluateContentRestriction:intoQualifier:): temporarily (-evaluateContentRestriction:intoQualifier:): temporarily
commented out code initializing "operator" as this local var is commented out code initializing "operator" as this local var is

View file

@ -39,13 +39,8 @@
NSMutableArray *attachmentKeys; NSMutableArray *attachmentKeys;
NSMutableDictionary *attachmentParts; NSMutableDictionary *attachmentParts;
NSMutableArray *activeTables; NSMutableArray *activeTables;
uint32_t mapiRetainCount;
} }
/* HACK: MAPI retain count */
- (void) setMAPIRetainCount: (uint32_t) newCount;
- (uint32_t) mapiRetainCount;
- (void) openMessage: (struct mapistore_message *) msg; - (void) openMessage: (struct mapistore_message *) msg;
/* helper getters */ /* helper getters */

View file

@ -54,7 +54,6 @@
{ {
if ((self = [super init])) if ((self = [super init]))
{ {
mapiRetainCount = 0;
attachmentKeys = nil; attachmentKeys = nil;
attachmentParts = nil; attachmentParts = nil;
activeTables = [NSMutableArray new]; activeTables = [NSMutableArray new];
@ -71,16 +70,6 @@
[super dealloc]; [super dealloc];
} }
- (void) setMAPIRetainCount: (uint32_t) newCount
{
mapiRetainCount = newCount;
}
- (uint32_t) mapiRetainCount
{
return mapiRetainCount;
}
- (void) openMessage: (struct mapistore_message *) msg - (void) openMessage: (struct mapistore_message *) msg
{ {
static enum MAPITAGS tags[] = { PR_SUBJECT_PREFIX_UNICODE, static enum MAPITAGS tags[] = { PR_SUBJECT_PREFIX_UNICODE,

View file

@ -39,6 +39,8 @@
{ {
const IMP *classGetters; const IMP *classGetters;
uint32_t mapiRetainCount;
NSMutableArray *parentContainersBag; NSMutableArray *parentContainersBag;
MAPIStoreObject *container; MAPIStoreObject *container;
id sogoObject; id sogoObject;
@ -54,6 +56,10 @@
- (id) initWithSOGoObject: (id) newSOGoObject - (id) initWithSOGoObject: (id) newSOGoObject
inContainer: (MAPIStoreObject *) newFolder; inContainer: (MAPIStoreObject *) newFolder;
/* HACK: MAPI retain count */
- (void) setMAPIRetainCount: (uint32_t) newCount;
- (uint32_t) mapiRetainCount;
- (void) setIsNew: (BOOL) newIsNew; - (void) setIsNew: (BOOL) newIsNew;
- (BOOL) isNew; - (BOOL) isNew;

View file

@ -95,6 +95,7 @@ static Class NSExceptionK, MAPIStoreFolderK;
{ {
if ((self = [super init])) if ((self = [super init]))
{ {
mapiRetainCount = 0;
classGetters = (IMP *) MAPIStorePropertyGettersForClass (isa); classGetters = (IMP *) MAPIStorePropertyGettersForClass (isa);
parentContainersBag = [NSMutableArray new]; parentContainersBag = [NSMutableArray new];
container = nil; container = nil;
@ -129,6 +130,16 @@ static Class NSExceptionK, MAPIStoreFolderK;
[super dealloc]; [super dealloc];
} }
- (void) setMAPIRetainCount: (uint32_t) newCount
{
mapiRetainCount = newCount;
}
- (uint32_t) mapiRetainCount
{
return mapiRetainCount;
}
- (void) setIsNew: (BOOL) newIsNew - (void) setIsNew: (BOOL) newIsNew
{ {
isNew = newIsNew; isNew = newIsNew;