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

Monotone-Parent: 07c1acd90de17a7e8f0064aff341a4244b2f090b 

Monotone-Revision: 19d23c85306b1d118c275902d56124e34314598d

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2011-07-12T04:23:43
Monotone-Branch: ca.inverse.sogo
maint-2.0.2
Wolfgang Sourdeau 2011-07-12 04:23:43 +00:00
parent 7a3300829f
commit e1daba320a
4 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2011-07-12 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* OpenChange/MAPIStoreTable.m
(-getRow:withRowID:andQueryType:inMemCtx:): slight change of
prototype in order to leave the structure initialization to the
backend.
2011-07-11 Francis Lachapelle <flachapelle@inverse.ca>
* UI/Scheduler/UIxAppointmentEditor.m

2
OpenChange/MAPIStoreSOGo.m
View File

@ -1086,7 +1086,7 @@ sogo_pocop_set_table_sort_order (void *table_object, struct SSortOrderSet *sort_
static int
sogo_pocop_get_table_row (void *table_object, TALLOC_CTX *mem_ctx,
enum table_query_type query_type, uint32_t row_id,
struct mapistore_property_data *data)
struct mapistore_property_data **data)
{
struct MAPIStoreTallocWrapper *wrapper;
NSAutoreleasePool *pool;

2
OpenChange/MAPIStoreTable.h
View File

@ -92,7 +92,7 @@ typedef enum {
- (void) setRestrictions: (const struct mapi_SRestriction *) res;
- (int) setColumns: (enum MAPITAGS *) newColumns
withCount: (uint16_t) newColumCount;
- (int) getRow: (struct mapistore_property_data *) data
- (int) getRow: (struct mapistore_property_data **) dataP
withRowID: (uint32_t) rowId
andQueryType: (enum table_query_type) queryType
inMemCtx: (TALLOC_CTX *) memCtx;

13
OpenChange/MAPIStoreTable.m
View File

@ -803,7 +803,7 @@ static Class NSDataK, NSStringK;
return child;
}
- (int) getRow: (struct mapistore_property_data *) data
- (int) getRow: (struct mapistore_property_data **) dataP
withRowID: (uint32_t) rowId
andQueryType: (enum table_query_type) queryType
inMemCtx: (TALLOC_CTX *) memCtx
@ -811,16 +811,19 @@ static Class NSDataK, NSStringK;
NSUInteger count;
MAPIStoreObject *child;
enum MAPISTATUS rc;
struct mapistore_property_data *rowData;
child = [self childAtRowID: rowId
forQueryType: queryType];
if (child)
{
rc = MAPI_E_SUCCESS;
rowData = talloc_array(memCtx, struct mapistore_property_data, columnsCount);
for (count = 0; count < columnsCount; count++)
data[count].error = [child getProperty: &data[count].data
withTag: columns[count]
inMemCtx: memCtx];
rowData[count].error = [child getProperty: &rowData[count].data
withTag: columns[count]
inMemCtx: memCtx];
*datap = rowData;
rc = MAPI_E_SUCCESS;
}
else
rc = MAPI_E_INVALID_OBJECT;