LupusNobilis
/
sogo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

See ChangeLog 

Monotone-Parent: 749811709acadced020a19e4ce7c00f07ac86e77
Monotone-Revision: 635c9e7117554059bb6df5357a9f71f448867b55

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2012-08-31T20:31:33
maint-2.0.2
Francis Lachapelle 2012-08-31 20:31:33 +00:00
parent 4798b18598
commit 665d11976a
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
SOPE/NGCards/ChangeLog
View File

@ -1,3 +1,9 @@
2012-08-31 Francis Lachapelle <flachapelle@inverse.ca>
* iCalWeeklyRecurrenceCalculator.m
(-recurrenceRangesWithinCalendarDateRange:): the week counter must
start at 0 when there's no day mask.
2012-08-22 Francis Lachapelle <flachapelle@inverse.ca>
* iCalWeeklyRecurrenceCalculator.m

5
SOPE/NGCards/iCalWeeklyRecurrenceCalculator.m
View File

@ -119,10 +119,10 @@
[currentStartDate autorelease];
ranges = [NSMutableArray array];
count = 0;
i = [currentStartDate dayOfWeek]; // Set the first day of the week as Sunday and ignore WKST
if (dayMask == nil)
{
i = 0;
while ([currentStartDate compare: endDate] == NSOrderedAscending ||
[currentStartDate compare: endDate] == NSOrderedSame)
{
@ -147,6 +147,7 @@
{
NGCalendarDateRange *r;
i = [currentStartDate dayOfWeek]; // Set the first day of the week as Sunday and ignore WKST
while ([currentStartDate compare: endDate] == NSOrderedAscending ||
[currentStartDate compare: endDate] == NSOrderedSame)
{
@ -175,7 +176,7 @@
if (isRecurrence)
{
count++;
count++;
if (repeatCount > 0 && count > repeatCount)
break;
currentEndDate = [currentStartDate addTimeInterval: [firstRange duration]];