merge of '25091cd75733e2785b3cd2550afa96d2cb4af894'

and 'cd75a2b1cab18760280675763a7f116e18c1be54'

Monotone-Parent: 25091cd75733e2785b3cd2550afa96d2cb4af894
Monotone-Parent: cd75a2b1cab18760280675763a7f116e18c1be54
Monotone-Revision: e1689f21ae9391a98de28b07ee195a3a85688a85

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2011-09-23T14:03:09
Monotone-Branch: ca.inverse.sogo

OpenChange/MAPIStoreContactsMessage.m

@@ -111,6 +111,7 @@
 //   return MAPISTORE_SUCCESS;
 // }
 
+
 - (int) getPrTitle: (void **) data
           inMemCtx: (TALLOC_CTX *) memCtx
 {
@@ -664,6 +665,67 @@
   return rc;
 }
 
+//
+// Decomposed fullname getters
+//
+- (int) getPrSurname: (void **) data
+	    inMemCtx: (TALLOC_CTX *) memCtx
+{  
+  NSString *stringValue;
+  
+  stringValue = [[[sogoObject vCard] firstChildWithTag: @"n"] value: 0];
+  *data = [stringValue asUnicodeInMemCtx: memCtx];
+
+  return MAPISTORE_SUCCESS;
+}
+
+- (int) getPrGivenName: (void **) data
+	      inMemCtx: (TALLOC_CTX *) memCtx
+{
+  NSString *stringValue;
+  
+  stringValue = [[[sogoObject vCard] firstChildWithTag: @"n"] value: 1];
+  *data = [stringValue asUnicodeInMemCtx: memCtx];
+
+  return MAPISTORE_SUCCESS;
+}
+
+- (int) getPrMiddleName: (void **) data
+	       inMemCtx: (TALLOC_CTX *) memCtx
+{
+  NSString *stringValue;
+  
+  stringValue = [[[sogoObject vCard] firstChildWithTag: @"n"] value: 2];
+  *data = [stringValue asUnicodeInMemCtx: memCtx];
+  
+  return MAPISTORE_SUCCESS;
+}
+
+- (int) getPrDisplayNamePrefix: (void **) data
+		      inMemCtx: (TALLOC_CTX *) memCtx
+{
+  NSString *stringValue;
+  
+  stringValue = [[[sogoObject vCard] firstChildWithTag: @"n"] value: 3];
+  *data = [stringValue asUnicodeInMemCtx: memCtx];
+  
+  return MAPISTORE_SUCCESS;
+}
+
+- (int) getPrGeneration: (void **) data
+	       inMemCtx: (TALLOC_CTX *) memCtx
+{
+  NSString *stringValue;
+  
+  stringValue = [[[sogoObject vCard] firstChildWithTag: @"n"] value: 4];
+  *data = [stringValue asUnicodeInMemCtx: memCtx];
+  
+  return MAPISTORE_SUCCESS;
+}
+
+//
+//
+//
 - (void) save
 {
   NSArray *elements, *units;