From 95fb350599595d1813d2ad188df15fa4ceb03548 Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Wed, 20 Jul 2011 18:28:37 +0000 Subject: [PATCH] Monotone-Parent: f7e22c2902aad2294bce4bf4189092795fafd616 Monotone-Revision: 2cb4c559e76b3864636b0072594c02216e619485 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2011-07-20T18:28:37 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 4 ++++ OpenChange/MAPIStoreCalendarMessage.m | 1 + OpenChange/MAPIStoreContactsMessage.m | 1 + OpenChange/MAPIStoreFAIMessage.m | 1 + OpenChange/MAPIStoreMailMessage.m | 1 + OpenChange/MAPIStoreMessage.m | 1 + OpenChange/MAPIStoreObject.h | 4 ---- OpenChange/MAPIStoreObject.m | 29 +------------------------- OpenChange/MAPIStoreTasksMessage.m | 1 + OpenChange/NSObject+MAPIStore.h | 6 ++++++ OpenChange/NSObject+MAPIStore.m | 30 +++++++++++++++++++++++++++ 11 files changed, 47 insertions(+), 32 deletions(-) diff --git a/ChangeLog b/ChangeLog index 807d24c0d..66a69843a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2011-07-20 Wolfgang Sourdeau + * OpenChange/MAPIStoreObject.m: moved "-getEmptyString:inMemCtx:", + "-getLongZero:inMemCtx:", "-getYes:inMemCtx:", "-getNo:inMemCtx:" + into NSObject+MAPIStore.m + * OpenChange/MAPIStoreFolder.m (-lookupFolder:, -createMessage:): assign the parent context woContext to the newly created SOGoObject to enable access to "activeUser". diff --git a/OpenChange/MAPIStoreCalendarMessage.m b/OpenChange/MAPIStoreCalendarMessage.m index 91cb1d263..b3771f62a 100644 --- a/OpenChange/MAPIStoreCalendarMessage.m +++ b/OpenChange/MAPIStoreCalendarMessage.m @@ -46,6 +46,7 @@ #import "MAPIStoreTypes.h" #import "NSDate+MAPIStore.h" #import "NSData+MAPIStore.h" +#import "NSObject+MAPIStore.h" #import "NSString+MAPIStore.h" #import "NSValue+MAPIStore.h" diff --git a/OpenChange/MAPIStoreContactsMessage.m b/OpenChange/MAPIStoreContactsMessage.m index e871582f4..2302fd590 100644 --- a/OpenChange/MAPIStoreContactsMessage.m +++ b/OpenChange/MAPIStoreContactsMessage.m @@ -35,6 +35,7 @@ #import "NSArray+MAPIStore.h" #import "NSDate+MAPIStore.h" #import "NSData+MAPIStore.h" +#import "NSObject+MAPIStore.h" #import "NSString+MAPIStore.h" #import "MAPIStoreContactsMessage.h" diff --git a/OpenChange/MAPIStoreFAIMessage.m b/OpenChange/MAPIStoreFAIMessage.m index 6a0d1ac94..dfc69b0bd 100644 --- a/OpenChange/MAPIStoreFAIMessage.m +++ b/OpenChange/MAPIStoreFAIMessage.m @@ -21,6 +21,7 @@ */ #import "MAPIStoreActiveTables.h" +#import "NSObject+MAPIStore.h" #import "MAPIStoreFAIMessage.h" diff --git a/OpenChange/MAPIStoreMailMessage.m b/OpenChange/MAPIStoreMailMessage.m index ee29369da..01e968e01 100644 --- a/OpenChange/MAPIStoreMailMessage.m +++ b/OpenChange/MAPIStoreMailMessage.m @@ -32,6 +32,7 @@ #import #import "NSData+MAPIStore.h" +#import "NSObject+MAPIStore.h" #import "NSString+MAPIStore.h" #import "MAPIStoreContext.h" #import "MAPIStoreFolder.h" diff --git a/OpenChange/MAPIStoreMessage.m b/OpenChange/MAPIStoreMessage.m index b7dc2f396..4257dc778 100644 --- a/OpenChange/MAPIStoreMessage.m +++ b/OpenChange/MAPIStoreMessage.m @@ -35,6 +35,7 @@ #import "MAPIStoreFolder.h" #import "MAPIStoreTypes.h" #import "NSData+MAPIStore.h" +#import "NSObject+MAPIStore.h" #import "NSString+MAPIStore.h" #import "MAPIStoreMessage.h" diff --git a/OpenChange/MAPIStoreObject.h b/OpenChange/MAPIStoreObject.h index e8055fde3..d7e784cd1 100644 --- a/OpenChange/MAPIStoreObject.h +++ b/OpenChange/MAPIStoreObject.h @@ -100,10 +100,6 @@ inMemCtx: (TALLOC_CTX *) localMemCtx; /* helper getters */ -- (int) getEmptyString: (void **) data inMemCtx: (TALLOC_CTX *) memCtx; -- (int) getLongZero: (void **) data inMemCtx: (TALLOC_CTX *) memCtx; -- (int) getYes: (void **) data inMemCtx: (TALLOC_CTX *) memCtx; -- (int) getNo: (void **) data inMemCtx: (TALLOC_CTX *) memCtx; - (int) getReplicaKey: (void **) data fromGlobCnt: (uint64_t) objectCnt inMemCtx: (TALLOC_CTX *) memCtx; diff --git a/OpenChange/MAPIStoreObject.m b/OpenChange/MAPIStoreObject.m index 4263509e8..e153b3eb9 100644 --- a/OpenChange/MAPIStoreObject.m +++ b/OpenChange/MAPIStoreObject.m @@ -32,6 +32,7 @@ #import "MAPIStoreTypes.h" #import "NSDate+MAPIStore.h" #import "NSData+MAPIStore.h" +#import "NSObject+MAPIStore.h" #import "NSString+MAPIStore.h" #import "MAPIStoreObject.h" @@ -276,34 +277,6 @@ static Class NSExceptionK, MAPIStoreFolderK; } /* helper getters */ -- (int) getEmptyString: (void **) data inMemCtx: (TALLOC_CTX *) memCtx -{ - *data = [@"" asUnicodeInMemCtx: memCtx]; - - return MAPISTORE_SUCCESS; -} - -- (int) getLongZero: (void **) data inMemCtx: (TALLOC_CTX *) memCtx -{ - *data = MAPILongValue (memCtx, 0); - - return MAPISTORE_SUCCESS; -} - -- (int) getYes: (void **) data inMemCtx: (TALLOC_CTX *) memCtx -{ - *data = MAPIBoolValue (memCtx, YES); - - return MAPISTORE_SUCCESS; -} - -- (int) getNo: (void **) data inMemCtx: (TALLOC_CTX *) memCtx -{ - *data = MAPIBoolValue (memCtx, NO); - - return MAPISTORE_SUCCESS; -} - - (int) getReplicaKey: (void **) data fromGlobCnt: (uint64_t) objectCnt inMemCtx: (TALLOC_CTX *) memCtx diff --git a/OpenChange/MAPIStoreTasksMessage.m b/OpenChange/MAPIStoreTasksMessage.m index b95ba3885..eb320b1d0 100644 --- a/OpenChange/MAPIStoreTasksMessage.m +++ b/OpenChange/MAPIStoreTasksMessage.m @@ -36,6 +36,7 @@ #import "MAPIStoreTypes.h" #import "NSDate+MAPIStore.h" +#import "NSObject+MAPIStore.h" #import "NSString+MAPIStore.h" #import "MAPIStoreTasksMessage.h" diff --git a/OpenChange/NSObject+MAPIStore.h b/OpenChange/NSObject+MAPIStore.h index 193458e5a..339630296 100644 --- a/OpenChange/NSObject+MAPIStore.h +++ b/OpenChange/NSObject+MAPIStore.h @@ -44,6 +44,12 @@ struct MAPIStoreTallocWrapper forTag: (enum MAPITAGS) propTag inMemCtx: (TALLOC_CTX *) memCtx; +/* getter helpers */ +- (int) getEmptyString: (void **) data inMemCtx: (TALLOC_CTX *) memCtx; +- (int) getLongZero: (void **) data inMemCtx: (TALLOC_CTX *) memCtx; +- (int) getYes: (void **) data inMemCtx: (TALLOC_CTX *) memCtx; +- (int) getNo: (void **) data inMemCtx: (TALLOC_CTX *) memCtx; + @end #endif /* NSOBJECT_MAPISTORE_H */ diff --git a/OpenChange/NSObject+MAPIStore.m b/OpenChange/NSObject+MAPIStore.m index 803a3c536..dbeaea6dd 100644 --- a/OpenChange/NSObject+MAPIStore.m +++ b/OpenChange/NSObject+MAPIStore.m @@ -23,6 +23,7 @@ #import #import +#import "MAPIStoreTypes.h" #import "NSData+MAPIStore.h" #import "NSDate+MAPIStore.h" #import "NSValue+MAPIStore.h" @@ -120,4 +121,33 @@ static int MAPIStoreTallocWrapperDestroy (void *data) return rc; } +/* helper getters */ +- (int) getEmptyString: (void **) data inMemCtx: (TALLOC_CTX *) memCtx +{ + *data = [@"" asUnicodeInMemCtx: memCtx]; + + return MAPISTORE_SUCCESS; +} + +- (int) getLongZero: (void **) data inMemCtx: (TALLOC_CTX *) memCtx +{ + *data = MAPILongValue (memCtx, 0); + + return MAPISTORE_SUCCESS; +} + +- (int) getYes: (void **) data inMemCtx: (TALLOC_CTX *) memCtx +{ + *data = MAPIBoolValue (memCtx, YES); + + return MAPISTORE_SUCCESS; +} + +- (int) getNo: (void **) data inMemCtx: (TALLOC_CTX *) memCtx +{ + *data = MAPIBoolValue (memCtx, NO); + + return MAPISTORE_SUCCESS; +} + @end