From 3dded781c2f2ecf52b233755ce70e5ad8d6dbc50 Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Fri, 11 Feb 2011 21:37:17 +0000 Subject: [PATCH] Monotone-Parent: 26cbeaca3585c432387d70a58a14fa4850bca000 Monotone-Revision: 33e2aa2b132966fb140cf836363d66bcada361fd Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2011-02-11T21:37:17 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 3 +++ OpenChange/MAPIStoreTable.h | 5 +++++ OpenChange/MAPIStoreTable.m | 20 ++++++++++---------- 3 files changed, 18 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 24df591e6..a68431878 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2011-02-11 Wolfgang Sourdeau + * OpenChange/MAPIStoreTable.m + (-warnUnhandledProperty:inFunction:): renamed and made method public. + * OpenChange/MAPIStoreGCSMessageTable.m (-evaluatePropertyRestriction:intoQualifier:) took version of method from MAPIStoreTable and modified it to diff --git a/OpenChange/MAPIStoreTable.h b/OpenChange/MAPIStoreTable.h index 5ccc7e643..2e4bb8de4 100644 --- a/OpenChange/MAPIStoreTable.h +++ b/OpenChange/MAPIStoreTable.h @@ -86,6 +86,11 @@ typedef enum { forKey: (NSString *) childKey withTag: (enum MAPITAGS) proptag; +/* helpers */ + +- (void) warnUnhandledProperty: (enum MAPITAGS) property + inFunction: (const char *) function; + /* subclasses */ - (NSArray *) childKeys; diff --git a/OpenChange/MAPIStoreTable.m b/OpenChange/MAPIStoreTable.m index 452ce5b73..c1a50730a 100644 --- a/OpenChange/MAPIStoreTable.m +++ b/OpenChange/MAPIStoreTable.m @@ -562,8 +562,8 @@ static Class NSDataK, NSStringK; return nil; } -- (void) _warnUnhandledPropertyException: (enum MAPITAGS) property - inFunction: (const char *) function +- (void) warnUnhandledProperty: (enum MAPITAGS) property + inFunction: (const char *) function { const char *propName; @@ -628,8 +628,8 @@ static Class NSDataK, NSStringK; } else { - [self _warnUnhandledPropertyException: res->ulPropTag - inFunction: __FUNCTION__]; + [self warnUnhandledProperty: res->ulPropTag + inFunction: __FUNCTION__]; rc = MAPIRestrictionStateAlwaysFalse; } @@ -675,8 +675,8 @@ static Class NSDataK, NSStringK; } else { - [self _warnUnhandledPropertyException: res->ulPropTag - inFunction: __FUNCTION__]; + [self warnUnhandledProperty: res->ulPropTag + inFunction: __FUNCTION__]; rc = MAPIRestrictionStateAlwaysFalse; } @@ -701,8 +701,8 @@ static Class NSDataK, NSStringK; } else { - [self _warnUnhandledPropertyException: res->ulPropTag - inFunction: __FUNCTION__]; + [self warnUnhandledProperty: res->ulPropTag + inFunction: __FUNCTION__]; rc = MAPIRestrictionStateAlwaysFalse; } @@ -727,8 +727,8 @@ static Class NSDataK, NSStringK; } else { - [self _warnUnhandledPropertyException: res->ulPropTag - inFunction: __FUNCTION__]; + [self warnUnhandledProperty: res->ulPropTag + inFunction: __FUNCTION__]; rc = MAPIRestrictionStateAlwaysFalse; }