LupusNobilis
/
sogo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Monotone-Parent: 64ba2e93f125a52eecebddb59943e772948d3477 

Monotone-Revision: 8ec67206fe2e60d10c9dd420d14aeb136a46afc8

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2011-06-06T23:59:31
Monotone-Branch: ca.inverse.sogo
maint-2.0.2
Wolfgang Sourdeau 2011-06-06 23:59:31 +00:00
parent fbdde21ec0
commit 26ce606830
6 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,5 +1,10 @@
2011-06-06 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* OpenChange/MAPIStoreSOGo.m
(sogo_pocop_get_available_table_properties): now takes a
SPropTagArray ** argument.
(sogo_pocop_get_available_properties): same as above.
* OpenChange/MAPIStoreTable.m (-notifyChangesForChild:): same as below.
* OpenChange/MAPIStoreContext.m

4
OpenChange/MAPIStoreObject.h
View File

@ -49,7 +49,7 @@
+ (id) mapiStoreObjectWithSOGoObject: (id) newSOGoObject
inContainer: (MAPIStoreObject *) newContainer;
+ (int) getAvailableProperties: (struct SPropTagArray *) properties;
+ (int) getAvailableProperties: (struct SPropTagArray **) properties;
- (id) initWithSOGoObject: (id) newSOGoObject
inContainer: (MAPIStoreObject *) newFolder;
@ -77,7 +77,7 @@
- (void) resetNewProperties;
/* ops */
- (int) getAvailableProperties: (struct SPropTagArray *) properties;
- (int) getAvailableProperties: (struct SPropTagArray **) properties;
- (int) getProperties: (struct mapistore_property_data *) data
withTags: (enum MAPITAGS *) tags
andCount: (uint16_t) columnCount;

12
OpenChange/MAPIStoreObject.m
View File

@ -61,13 +61,15 @@ static Class NSExceptionK, MAPIStoreFolderK;
return newObject;
}
+ (int) getAvailableProperties: (struct SPropTagArray *) properties
+ (int) getAvailableProperties: (struct SPropTagArray **) propertiesP
{
struct SPropTagArray *properties;
const MAPIStorePropertyGetter *classGetters;
NSUInteger count;
enum MAPITAGS propTag;
uint16_t propValue;
properties = talloc_zero(NULL, struct SPropTagArray);
properties->aulPropTag = talloc_array (properties, enum MAPITAGS,
MAPIStoreSupportedPropertiesCount);
classGetters = MAPIStorePropertyGettersForClass (self);
@ -82,7 +84,9 @@ static Class NSExceptionK, MAPIStoreFolderK;
}
}
return 0;
*propertiesP = properties;
return MAPISTORE_SUCCESS;
}
- (id) init
@ -293,9 +297,9 @@ static Class NSExceptionK, MAPIStoreFolderK;
return [self getNo: data];
}
- (int) getAvailableProperties: (struct SPropTagArray *) properties
- (int) getAvailableProperties: (struct SPropTagArray **) propertiesP
{
return [isa getAvailableProperties: properties];
return [isa getAvailableProperties: propertiesP];
}
- (int) getProperties: (struct mapistore_property_data *) data

8
OpenChange/MAPIStoreSOGo.m
View File

@ -942,7 +942,7 @@ sogo_pocop_open_embedded_message (void *attachment_object,
return rc;
}
static int sogo_pocop_get_available_table_properties(void *table_object, struct SPropTagArray *properties)
static int sogo_pocop_get_available_table_properties(void *table_object, struct SPropTagArray **propertiesP)
{
NSAutoreleasePool *pool;
MAPIStoreTable *table;
@ -954,7 +954,7 @@ static int sogo_pocop_get_available_table_properties(void *table_object, struct
if (table)
{
pool = [NSAutoreleasePool new];
rc = [table getAvailableProperties: properties];
rc = [table getAvailableProperties: propertiesP];
[pool release];
}
else
@ -1073,7 +1073,7 @@ sogo_pocop_get_table_row (void *table_object, enum table_query_type query_type,
return rc;
}
static int sogo_pocop_get_available_properties(void *object, struct SPropTagArray *properties)
static int sogo_pocop_get_available_properties(void *object, struct SPropTagArray **propertiesP)
{
NSAutoreleasePool *pool;
MAPIStoreObject *propObject;
@ -1085,7 +1085,7 @@ static int sogo_pocop_get_available_properties(void *object, struct SPropTagArra
if (propObject)
{
pool = [NSAutoreleasePool new];
rc = [propObject getAvailableProperties: properties];
rc = [propObject getAvailableProperties: propertiesP];
[pool release];
}
else

2
OpenChange/MAPIStoreTable.h
View File

@ -85,7 +85,7 @@ typedef enum {
- (void) cleanupCaches;
- (int) getAvailableProperties: (struct SPropTagArray *) properties;
- (int) getAvailableProperties: (struct SPropTagArray **) propertiesP;
- (void) setRestrictions: (const struct mapi_SRestriction *) res;
- (int) setColumns: (enum MAPITAGS *) newColumns
withCount: (uint16_t) newColumCount;

4
OpenChange/MAPIStoreTable.m
View File

@ -375,9 +375,9 @@ static Class NSDataK, NSStringK;
currentRow = (uint32_t) -1;
}
- (int) getAvailableProperties: (struct SPropTagArray *) properties
- (int) getAvailableProperties: (struct SPropTagArray **) propertiesP
{
return [[isa childObjectClass] getAvailableProperties: properties];
return [[isa childObjectClass] getAvailableProperties: propertiesP];
}
- (void) setRestrictions: (const struct mapi_SRestriction *) res