merge of '26f45bf17d39a252cb6b60da3f39bfb9965a2f83'
and 'fb5168d6a8a15251f195c6088e8bc566b7b29809' Monotone-Parent: 26f45bf17d39a252cb6b60da3f39bfb9965a2f83 Monotone-Parent: fb5168d6a8a15251f195c6088e8bc566b7b29809 Monotone-Revision: d46f4a0ff945f9aea6a53dcd6b70ed69289186dc Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2011-07-14T21:34:19 Monotone-Branch: ca.inverse.sogo
This commit is contained in:
commit
49e302894d
|
@ -1,5 +1,10 @@
|
||||||
2011-07-14 Wolfgang Sourdeau <wsourdeau@inverse.ca>
|
2011-07-14 Wolfgang Sourdeau <wsourdeau@inverse.ca>
|
||||||
|
|
||||||
|
* OpenChange/NSArray+MAPIStore.m (-asFoldersListInCtx:) removed
|
||||||
|
useless method.
|
||||||
|
(-asArrayOfUnicodeStringsInCtx:) properly connect the talloc
|
||||||
|
hierarchy nodes.
|
||||||
|
|
||||||
* OpenChange/MAPIStoreSOGo.m: adapted to latest mapistore_backend
|
* OpenChange/MAPIStoreSOGo.m: adapted to latest mapistore_backend
|
||||||
nomenclature.
|
nomenclature.
|
||||||
|
|
||||||
|
|
|
@ -27,7 +27,6 @@
|
||||||
|
|
||||||
@interface NSArray (MAPIStoreFolders)
|
@interface NSArray (MAPIStoreFolders)
|
||||||
|
|
||||||
- (struct indexing_folders_list *) asFoldersListInCtx: (void *) memCtx;
|
|
||||||
- (struct mapi_SPLSTRArrayW *) asArrayOfUnicodeStringsInCtx: (void *) memCtx;
|
- (struct mapi_SPLSTRArrayW *) asArrayOfUnicodeStringsInCtx: (void *) memCtx;
|
||||||
|
|
||||||
@end
|
@end
|
||||||
|
|
|
@ -32,23 +32,6 @@
|
||||||
|
|
||||||
@implementation NSArray (MAPIStoreFolders)
|
@implementation NSArray (MAPIStoreFolders)
|
||||||
|
|
||||||
- (struct indexing_folders_list *) asFoldersListInCtx: (void *) memCtx
|
|
||||||
{
|
|
||||||
struct indexing_folders_list *flist;
|
|
||||||
NSInteger count, max;
|
|
||||||
|
|
||||||
max = [self count];
|
|
||||||
|
|
||||||
flist = talloc_zero(memCtx, struct indexing_folders_list);
|
|
||||||
flist->folderID = talloc_array(flist, uint64_t, max);
|
|
||||||
flist->count = max;
|
|
||||||
|
|
||||||
for (count = 0; count < max; count++)
|
|
||||||
*(flist->folderID + count) = [[self objectAtIndex: count] unsignedLongLongValue];
|
|
||||||
|
|
||||||
return flist;
|
|
||||||
}
|
|
||||||
|
|
||||||
- (struct mapi_SPLSTRArrayW *) asArrayOfUnicodeStringsInCtx: (void *) memCtx
|
- (struct mapi_SPLSTRArrayW *) asArrayOfUnicodeStringsInCtx: (void *) memCtx
|
||||||
{
|
{
|
||||||
struct mapi_SPLSTRArrayW *list;
|
struct mapi_SPLSTRArrayW *list;
|
||||||
|
@ -58,10 +41,10 @@
|
||||||
|
|
||||||
list = talloc_zero(memCtx, struct mapi_SPLSTRArrayW);
|
list = talloc_zero(memCtx, struct mapi_SPLSTRArrayW);
|
||||||
list->cValues = max;
|
list->cValues = max;
|
||||||
list->strings = talloc_array(memCtx, struct mapi_LPWSTR, max);
|
list->strings = talloc_array(list, struct mapi_LPWSTR, max);
|
||||||
|
|
||||||
for (count = 0; count < max; count++)
|
for (count = 0; count < max; count++)
|
||||||
(list->strings + count)->lppszW = [[self objectAtIndex: count] asUnicodeInMemCtx: memCtx];
|
(list->strings + count)->lppszW = [[self objectAtIndex: count] asUnicodeInMemCtx: list->strings];
|
||||||
|
|
||||||
return list;
|
return list;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue