mirror of
https://github.com/inverse-inc/sogo.git
synced 2026-08-07 16:03:20 +00:00
See Changelog.
Monotone-Parent: f632b73418c67ba2778ff41a75a2842d90da9883 Monotone-Revision: 8ae1b0b4d89d23b2996f0b95677ca5599649f47b Monotone-Author: flachapelle@inverse.ca Monotone-Date: 2011-01-14T15:33:20 Monotone-Branch: ca.inverse.sogo
This commit is contained in:
@@ -118,6 +118,7 @@
|
||||
NGCalendarDateRange *checkRange, *firstRange;
|
||||
NSCalendarDate *startDate, *endDate;
|
||||
iCalDateTime *firstStartDate;
|
||||
iCalTimeZone *eventTimeZone;
|
||||
BOOL doesOccur;
|
||||
|
||||
doesOccur = [self isRecurrent];
|
||||
@@ -128,7 +129,8 @@
|
||||
|
||||
// Set the range to check with respect to the event timezone (extracted from the start date)
|
||||
firstStartDate = (iCalDateTime *)[self uniqueChildWithTag: @"dtstart"];
|
||||
startDate = [[firstStartDate timeZone] computedDateForDate: theOccurenceDate];
|
||||
eventTimeZone = [firstStartDate timeZone];
|
||||
startDate = [eventTimeZone computedDateForDate: theOccurenceDate];
|
||||
endDate = [startDate addTimeInterval: [self occurenceInterval]];
|
||||
checkRange = [NGCalendarDateRange calendarDateRangeWithStartDate: startDate
|
||||
endDate: endDate];
|
||||
@@ -138,7 +140,7 @@
|
||||
firstInstanceCalendarDateRange: firstRange
|
||||
recurrenceRules: [self recurrenceRules]
|
||||
exceptionRules: [self exceptionRules]
|
||||
exceptionDates: [self exceptionDates]];
|
||||
exceptionDates: [self exceptionDatesWithEventTimeZone: eventTimeZone]];
|
||||
doesOccur = [ranges dateRangeArrayContainsDate: startDate];
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user