See ChangeLog.
Monotone-Parent: f51ae70ff345179926dfdd4fd5856e968bdfc327 Monotone-Revision: 1e79eab4c546452715e5171f1c326b7d36f1c195 Monotone-Author: flachapelle@inverse.ca Monotone-Date: 2012-05-29T17:24:24maint-2.0.2
parent
66c972eb97
commit
2e49702e3f
|
@ -1,3 +1,11 @@
|
||||||
|
2012-05-29 Francis Lachapelle <flachapelle@inverse.ca>
|
||||||
|
|
||||||
|
* iCalRecurrenceCalculator.m
|
||||||
|
(_removeExceptionDatesFromRanges:withDates:withinRange:startingWithDate:):
|
||||||
|
when removing exception dates, avoid removing dates matching the
|
||||||
|
end date of the occurrence. This fixes an issue with all-day
|
||||||
|
daily events.
|
||||||
|
|
||||||
2012-04-23 Wolfgang Sourdeau <wsourdeau@inverse.ca>
|
2012-04-23 Wolfgang Sourdeau <wsourdeau@inverse.ca>
|
||||||
|
|
||||||
* iCalMonthlyRecurrenceCalculator.m (NGMonthDaySet_clear): make
|
* iCalMonthlyRecurrenceCalculator.m (NGMonthDaySet_clear): make
|
||||||
|
|
|
@ -189,6 +189,7 @@ static Class yearlyCalcClass = Nil;
|
||||||
NSCalendarDate *currentDate;
|
NSCalendarDate *currentDate;
|
||||||
NGCalendarDateRange *currentRange;
|
NGCalendarDateRange *currentRange;
|
||||||
unsigned int count, maxRanges;
|
unsigned int count, maxRanges;
|
||||||
|
NSComparisonResult compare;
|
||||||
|
|
||||||
dates = [[self _dates: exdates withinRange: limits] objectEnumerator];
|
dates = [[self _dates: exdates withinRange: limits] objectEnumerator];
|
||||||
while ((currentDate = [dates nextObject]))
|
while ((currentDate = [dates nextObject]))
|
||||||
|
@ -197,7 +198,9 @@ static Class yearlyCalcClass = Nil;
|
||||||
for (count = maxRanges; count > 0; count--)
|
for (count = maxRanges; count > 0; count--)
|
||||||
{
|
{
|
||||||
currentRange = [ranges objectAtIndex: count - 1];
|
currentRange = [ranges objectAtIndex: count - 1];
|
||||||
if ([currentRange containsDate: currentDate])
|
compare = [[currentRange startDate] compare: currentDate];
|
||||||
|
if ((compare == NSOrderedAscending || compare == NSOrderedSame) &&
|
||||||
|
[[currentRange endDate] compare: currentDate] == NSOrderedDescending)
|
||||||
[ranges removeObjectAtIndex: count - 1];
|
[ranges removeObjectAtIndex: count - 1];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue