From 12e392452ca907b355cd94df6f71775bfd7f87c6 Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Thu, 6 Jan 2011 03:18:38 +0000
Subject: [PATCH] Monotone-Parent: 6bf607a80d572f2c918d9796375bba09943229cc
 Monotone-Revision: 63e89008bf0aa0171f79d7bf4570993b929c7c0d

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2011-01-06T03:18:38
Monotone-Branch: ca.inverse.sogo
---
 ChangeLog                                  | 6 ++++++
 OpenChange/SOGoContactGCSEntry+MAPIStore.m | 4 +++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 730df92d8..c63d43685 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-01-05  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* OpenChange/SOGoContactGCSEntry+MAPIStore.m (-setMAPIProperties):
+	take  "PidLidEmail1EmailAddress" id as key for the contact email
+	address.
+
 2011-01-05  Ludovic Marcotte  <lmarcotte@inverse.ca>
 
         * SoObjects/SOGo/SQLSource.m - we now honor the "mail" column
diff --git a/OpenChange/SOGoContactGCSEntry+MAPIStore.m b/OpenChange/SOGoContactGCSEntry+MAPIStore.m
index cf03364b0..9a3b78ff6 100644
--- a/OpenChange/SOGoContactGCSEntry+MAPIStore.m
+++ b/OpenChange/SOGoContactGCSEntry+MAPIStore.m
@@ -27,6 +27,8 @@
 #import <NGExtensions/NSObject+Logs.h>
 #import <NGCards/NGVCard.h>
 
+#include <mapistore/mapistore_nameid.h>
+
 #import "MAPIStoreTypes.h"
 
 #import "SOGoContactGCSEntry+MAPIStore.h"
@@ -60,7 +62,7 @@
   if (value)
     [newCard setFn: value];
 
-  value = [properties objectForKey: MAPIPropertyKey (0x81b0001f)];
+  value = [properties objectForKey: MAPIPropertyKey (PidLidEmail1EmailAddress)];
   if (value)
     [newCard addEmail: value types: nil];