From 49cea3f16a3fd0604f365c6849ab872bb527799f Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Thu, 12 Oct 2006 21:45:03 +0000 Subject: [PATCH] Monotone-Parent: 8247ee1aea2d7155ebcb02100eb79a881ce80c12 Monotone-Revision: ff20e1ce01ed549c6dafa9c54cd70d58e18ec3ae Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2006-10-12T21:45:03 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 4 ++++ UI/Scheduler/UIxAppointmentEditor.m | 16 ++++++++++------ 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index f61809c6b..d42aa9d2c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2006-10-12 Wolfgang Sourdeau + * UI/Scheduler/UIxAppointmentEditor.m ([UIxAppointmentEditor + -iCalStringFromQueryParameter:format:]): dates explicitly set to + utc tz. + * UI/WebServerResources/SchedulerUI.js: manage both lists of objects wrt to the toolbar actions. diff --git a/UI/Scheduler/UIxAppointmentEditor.m b/UI/Scheduler/UIxAppointmentEditor.m index fde4bd7ba..23592e679 100644 --- a/UI/Scheduler/UIxAppointmentEditor.m +++ b/UI/Scheduler/UIxAppointmentEditor.m @@ -429,8 +429,8 @@ @"CLASS:PUBLIC\r\n" @"STATUS:CONFIRMED\r\n" /* confirmed by default */ @"DTSTAMP:%@Z\r\n" - @"DTSTART:%@\r\n" - @"DTEND:%@\r\n" + @"DTSTART:%@Z\r\n" + @"DTEND:%@Z\r\n" @"TRANSP:%@\r\n" @"SEQUENCE:1\r\n" @"PRIORITY:5\r\n" @@ -439,6 +439,7 @@ @"END:VEVENT\r\n" @"END:VCALENDAR"; + NSTimeZone *utc; NSCalendarDate *lStartDate, *lEndDate, *stamp; NSString *template, *s; unsigned minutes; @@ -450,13 +451,16 @@ else { minutes = 60; } + + utc = [NSTimeZone timeZoneWithName: @"GMT"]; lStartDate = [self selectedDate]; - lEndDate = [lStartDate dateByAddingYears:0 months:0 days:0 - hours:0 minutes:minutes seconds:0]; + [lStartDate setTimeZone: utc]; + lEndDate = [lStartDate dateByAddingYears: 0 months: 0 days: 0 + hours: 0 minutes: minutes seconds: 0]; stamp = [NSCalendarDate calendarDate]; - [stamp setTimeZone: [NSTimeZone timeZoneWithName: @"GMT"]]; - + [stamp setTimeZone: utc]; + s = [self iCalParticipantsAndResourcesStringFromQueryParameters]; template = [NSString stringWithFormat:iCalStringTemplate, [[self clientObject] nameInContainer],