From d8b2d852b9c5252da1288d8fd78d81d39a5f1520 Mon Sep 17 00:00:00 2001 From: Ludovic Marcotte Date: Fri, 17 Jun 2011 20:57:17 +0000 Subject: [PATCH] See ChangeLog Monotone-Parent: a1ae082f345f010ed0903ee2ac6873682313ca49 Monotone-Revision: 9c23081be1d521d038cc4cbf8d2034a12fca88aa Monotone-Author: ludovic@Sophos.ca Monotone-Date: 2011-06-17T20:57:17 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 7 +++++++ SOPE/NGCards/iCalEvent.m | 5 +++++ 2 files changed, 12 insertions(+) diff --git a/ChangeLog b/ChangeLog index ec65010b5..07c6a97c0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2011-06-17 Ludovic Marcotte + + * SOPE/NGCards/iCalEvent.m (setAllDayWithStartDate:duration:): + We now correctly remove the duration value in case we're + "converting" the event to an all-day one. This fixes + bug #1312. + 2011-06-16 Ludovic Marcotte * UI/Contacts/UIxContactFolderActions.m (importLdifData:): diff --git a/SOPE/NGCards/iCalEvent.m b/SOPE/NGCards/iCalEvent.m index be80b3766..e8754c869 100644 --- a/SOPE/NGCards/iCalEvent.m +++ b/SOPE/NGCards/iCalEvent.m @@ -56,6 +56,7 @@ duration: (unsigned int) days { NSCalendarDate *endDate; + CardElement *c; [(iCalDateTime *) [self uniqueChildWithTag: @"dtstart"] setDate: newStartDate]; @@ -65,6 +66,10 @@ [endDate setTimeZone: [newStartDate timeZone]]; [(iCalDateTime *) [self uniqueChildWithTag: @"dtend"] setDate: endDate]; + + c = [self uniqueChildWithTag: @"duration"]; + if (c) + [self removeChild: c]; } - (void) setEndDate: (NSCalendarDate *) newEndDate