From 97cedb6f85c7e5b3697b22e5d20100c9e66527f9 Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Wed, 7 Jan 2009 16:44:24 +0000 Subject: [PATCH] Monotone-Parent: bd80ab1b5ef73a7bb7780c2f592816cd299c35b8 Monotone-Revision: 7dbd8709dbd0912d12d3ffd82df6d64d900a28b6 Monotone-Author: flachapelle@inverse.ca Monotone-Date: 2009-01-07T16:44:24 Monotone-Branch: ca.inverse.sogo --- UI/Scheduler/UIxAppointmentEditor.m | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/UI/Scheduler/UIxAppointmentEditor.m b/UI/Scheduler/UIxAppointmentEditor.m index 9d5e37ff4..6bc79dd69 100644 --- a/UI/Scheduler/UIxAppointmentEditor.m +++ b/UI/Scheduler/UIxAppointmentEditor.m @@ -310,12 +310,13 @@ if (untilDate) { // The until date must match the time of the start date - untilDate = [untilDate dateByAddingYears:0 - months:0 - days:0 - hours:[[event startDate] hourOfDay] - minutes:[[event startDate] minuteOfHour] - seconds:0]; + untilDate = [untilDate initWithYear: [untilDate yearOfCommonEra] + month: [untilDate monthOfYear] + day: [untilDate dayOfMonth] + hour: [[event startDate] hourOfDay] + minute: [[event startDate] minuteOfHour] + second: 0 + timeZone: [untilDate timeZone]]; [rule setUntilDate: untilDate]; } }