From 65b25f5a75178e12b7f0ae79108b4851709948ad Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Fri, 2 Mar 2012 20:43:00 +0000
Subject: [PATCH] Monotone-Parent: e5be024d92916be1586d601d50ed79f354eda2c7
 Monotone-Revision: 1e532558ba17916d33138e4c65d283faf4d0e929

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-03-02T20:43:00
Monotone-Branch: ca.inverse.sogo
---
 ChangeLog                      |  3 +++
 OpenChange/NSArray+MAPIStore.h |  6 +++---
 OpenChange/NSArray+MAPIStore.m | 10 +++++-----
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 45d962298..a4cc1fac1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2012-03-02  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* OpenChange/NSArray+MAPIStore.[hm]: updated to new name of
+	handled structs.
+
 	* OpenChange/gen-property-selectors.py: adapted for new getters
 	name, based on new property names. Added all new clashing
 	properties to bannedProps.
diff --git a/OpenChange/NSArray+MAPIStore.h b/OpenChange/NSArray+MAPIStore.h
index 06e43f184..6bcf5f01d 100644
--- a/OpenChange/NSArray+MAPIStore.h
+++ b/OpenChange/NSArray+MAPIStore.h
@@ -29,7 +29,7 @@
 
 /* mapi structs */
 + (id) arrayFromMAPIMVLong: (const struct mapi_MV_LONG_STRUCT *) mvLong;
-+ (id) arrayFromMAPIMVUnicode: (const struct mapi_SPLSTRArrayW *) mvUnicode;
++ (id) arrayFromMAPIMVUnicode: (const struct mapi_SLPSTRArrayW *) mvUnicode;
 + (id) arrayFromMAPIMVString: (const struct mapi_SLPSTRArray *) mvString;
 + (id) arrayFromMAPIMVBinary: (const struct mapi_SBinaryArray *) mvBinary;
 + (id) arrayFromMAPIMVGuid: (const struct mapi_SGuidArray *) mvGuid;
@@ -39,8 +39,8 @@
 - (struct LongArray_r *) asMVLongInMemCtx: (void *) memCtx;
 + (id) arrayFromMVI8: (const struct I8Array_r *) mvI8;
 + (id) arrayFromMVString: (const struct StringArray_r *) mvString;
-+ (id) arrayFromMVUnicode: (const struct WStringArray_r *) mvUnicode;
-- (struct WStringArray_r *) asMVUnicodeInMemCtx: (void *) memCtx;
++ (id) arrayFromMVUnicode: (const struct StringArrayW_r *) mvUnicode;
+- (struct StringArrayW_r *) asMVUnicodeInMemCtx: (void *) memCtx;
 + (id) arrayFromMVBinary: (const struct BinaryArray_r *) mvBinary;
 - (struct BinaryArray_r *) asMVBinaryInMemCtx: (void *) memCtx;
 + (id) arrayFromMVGuid: (const struct FlatUIDArray_r *) mvGuid;
diff --git a/OpenChange/NSArray+MAPIStore.m b/OpenChange/NSArray+MAPIStore.m
index 6587154f9..1192ce124 100644
--- a/OpenChange/NSArray+MAPIStore.m
+++ b/OpenChange/NSArray+MAPIStore.m
@@ -52,7 +52,7 @@
   return mvResult;
 }
 
-+ (id) arrayFromMAPIMVUnicode: (struct mapi_SPLSTRArrayW *) mvUnicode
++ (id) arrayFromMAPIMVUnicode: (struct mapi_SLPSTRArrayW *) mvUnicode
 {
   NSUInteger count;
   NSString *subObject;
@@ -185,7 +185,7 @@
   return mvResult;
 }
 
-+ (id) arrayFromMVUnicode: (const struct WStringArray_r *) mvUnicode
++ (id) arrayFromMVUnicode: (const struct StringArrayW_r *) mvUnicode
 {
   NSUInteger count;
   NSString *subObject;
@@ -201,14 +201,14 @@
   return mvResult;
 }
 
-- (struct WStringArray_r *) asMVUnicodeInMemCtx: (void *) memCtx
+- (struct StringArrayW_r *) asMVUnicodeInMemCtx: (void *) memCtx
 {
-  struct WStringArray_r *list;
+  struct StringArrayW_r *list;
   NSInteger count, max;
 
   max = [self count];
 
-  list = talloc_zero (memCtx, struct WStringArray_r);
+  list = talloc_zero (memCtx, struct StringArrayW_r);
   list->cValues = max;
   list->lppszW = talloc_array (list, const char *, max);