From d82adbceca2ab9f9a727eaccdb22cce4deb4bf60 Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Tue, 11 Jan 2011 21:17:52 +0000 Subject: [PATCH] Monotone-Parent: cf5ca218da1c1ff34ff78091ca6ef9e4d34fdfb3 Monotone-Revision: 044ebf928befcb199e07d3b192460518361eb827 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2011-01-11T21:17:52 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 4 ++++ OpenChange/MAPIStoreContext.m | 12 +++++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index ac74fd60f..9acf1b60a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2011-01-11 Wolfgang Sourdeau + * OpenChange/MAPIStoreContext.m (-openMessage:forKey:inTable:): + avoid taking NULL values into account when returning the basic + properties. + * OpenChange/SOGoContactGCSEntry+MAPIStore.m (-setMAPIProperties:): added support for work address and its corresponding addresse label. Preliminary support for diff --git a/OpenChange/MAPIStoreContext.m b/OpenChange/MAPIStoreContext.m index e8b8bf841..499758b67 100644 --- a/OpenChange/MAPIStoreContext.m +++ b/OpenChange/MAPIStoreContext.m @@ -803,11 +803,13 @@ _prepareContextClass (struct mapistore_context *newMemCtx, @" returned for proptag %s(0x%.8x)", propName, tags[count]]; } - - set_SPropValue_proptag (properties->lpProps + properties->cValues, - tags[count], - propValue); - properties->cValues++; + else + { + set_SPropValue_proptag (properties->lpProps + properties->cValues, + tags[count], + propValue); + properties->cValues++; + } } } msg->properties = properties;