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

merge of '26f45bf17d39a252cb6b60da3f39bfb9965a2f83'

Browse source 
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:
Wolfgang Sourdeau 2011-07-14 21:34:19 +00:00
parent 8367ad3a63 4e9226ce9d
commit 49e302894d
3 changed files with 7 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,5 +1,10 @@
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
nomenclature.

1
OpenChange/NSArray+MAPIStore.h
View file

@ -27,7 +27,6 @@
@interface NSArray (MAPIStoreFolders)
- (struct indexing_folders_list *) asFoldersListInCtx: (void *) memCtx;
- (struct mapi_SPLSTRArrayW *) asArrayOfUnicodeStringsInCtx: (void *) memCtx;
@end

21
OpenChange/NSArray+MAPIStore.m
View file

@ -32,23 +32,6 @@
@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 *list;
@ -58,10 +41,10 @@
list = talloc_zero(memCtx, struct mapi_SPLSTRArrayW);
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++)
(list->strings + count)->lppszW = [[self objectAtIndex: count] asUnicodeInMemCtx: memCtx];
(list->strings + count)->lppszW = [[self objectAtIndex: count] asUnicodeInMemCtx: list->strings];
return list;
}