From 07b500412fc0d2b7542a3ff6199a5efa51c81213 Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Fri, 30 Mar 2012 20:02:33 +0000 Subject: [PATCH] Monotone-Parent: b0de6c606ce6f295a8956a42ed0f0bc3b6e3cca3 Monotone-Revision: 24970ed1a272e80da6d29bce76d7fb4093a1d2a6 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2012-03-30T20:02:33 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 4 ++++ OpenChange/MAPIStoreCalendarMessage.m | 11 +++++++---- OpenChange/MAPIStoreTasksMessage.m | 2 +- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index ed8c5bedd..be5956ea4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,8 +1,12 @@ 2012-03-30 Wolfgang Sourdeau + * OpenChange/MAPIStoreCalendarMessage.m (-save): remove comment if + content is "\n". + * OpenChange/MAPIStoreTasksMessage.m (-save): do not reset fields that have not been passed in the properties array, since only RopDeleteProperties should remove them. + Remove comment if content is "\n". * OpenChange/MAPIStoreObject.m (-addPropertiesFromRow:): dates are now all converted to the user's timezone, even though it just diff --git a/OpenChange/MAPIStoreCalendarMessage.m b/OpenChange/MAPIStoreCalendarMessage.m index 70aa0b64a..daa9cc83d 100644 --- a/OpenChange/MAPIStoreCalendarMessage.m +++ b/OpenChange/MAPIStoreCalendarMessage.m @@ -874,10 +874,13 @@ value = [value htmlToText]; } } - if (value && [value length] == 0) - value = nil; - [newEvent setComment: value]; - + if (value) + { + if ([value length] == 0 || [value isEqualToString: @"\\n"]) + value = nil; + [newEvent setComment: value]; + } + /* recurrence */ value = [properties objectForKey: MAPIPropertyKey (PidLidAppointmentRecur)]; diff --git a/OpenChange/MAPIStoreTasksMessage.m b/OpenChange/MAPIStoreTasksMessage.m index cad848f76..e3a24afe5 100644 --- a/OpenChange/MAPIStoreTasksMessage.m +++ b/OpenChange/MAPIStoreTasksMessage.m @@ -365,7 +365,7 @@ } if (value) { - if ([value length] == 0) + if ([value length] == 0 || [value isEqualToString: @"\\n"]) value = nil; [vToDo setComment: value]; }