Monotone-Parent: 3e11a03b205eab5434bea8b8a0f1a401eff54568

Monotone-Revision: 6f1338144b759c9dc200e2c5d7293a054ecf5ebf

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2008-12-30T14:48:25
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Francis Lachapelle
2008-12-30 14:48:25 +00:00
parent eccf8870d4
commit 4df63a393f
2 changed files with 19 additions and 4 deletions
+15
View File
@@ -1,3 +1,18 @@
2008-12-30 Francis Lachapelle <flachapelle@inverse.ca>
* SoObjects/Appointments/SOGoAppointmentFolder.m
([SOGoAppointmentFolder
-fixupCycleRecord:cycleRange:firstInstanceCalendarDateRange:forViewRange:]):
Fixed the start/end dates and recurrence id of events that span a
time period where the daylight saving time changes.
([SOGoAppointmentFolder
-_appendCycleException:firstInstanceCalendarDateRange:fromRow:forRange:toArray:]):
idem.
* UI/Scheduler/UIxAppointmentEditor.m ([UIxAppointmentEditor
-defaultAction]): idem.
([UIxAppointmentEditor -viewAction]): idem.
2008-12-23 Ludovic Marcotte <lmarcotte@inverse.ca>
* SoObjects/Appointments/SOGoAppointmentFolder.{h,m}
+4 -4
View File
@@ -257,19 +257,19 @@
{
NSCalendarDate *recurrenceId;
NSString *recurrenceTime;
BOOL inCalendar;
BOOL isInCalendar;
recurrenceId = [[self inEvent] recurrenceId];
if (recurrenceId)
{
recurrenceTime = [NSString stringWithFormat: @"%f", [recurrenceId timeIntervalSince1970]];
inCalendar = ([[self storedEventObject] lookupOccurence: recurrenceTime] != nil);
isInCalendar = ([[self storedEventObject] lookupOccurence: recurrenceTime] != nil);
}
else
inCalendar = ([self storedEventObject] != nil);
isInCalendar = ([self storedEventObject] != nil);
return inCalendar;
return isInCalendar;
}
- (iCalEvent *) storedEvent