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

Monotone-Parent: db9ec5b861b659354c77dd7978e1c7f78f92de3e 

Monotone-Revision: 3e7ab09417e0eb7a43c8f716a4a51471466afee8

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2010-04-20T20:29:59
Monotone-Branch: ca.inverse.sogo
maint-2.0.2
Francis Lachapelle 2010-04-20 20:29:59 +00:00
parent c9cebfec36
commit bd948aa0e0
4 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
SOPE/NGCards/iCalByDayMask.m
View File

@ -61,16 +61,16 @@
+ (id) byDayMaskWithWeekDays
{
id o;
iCalWeekOccurrences d;
iCalWeekOccurrences days;
days[iCalWeekDaySunday] = 0;
days[iCalWeekDayMonday] = iCalWeekOccurrenceAll;
days[iCalWeekDayTuesday] = iCalWeekOccurrenceAll;
days[iCalWeekDayWednesday] = iCalWeekOccurrenceAll;
days[iCalWeekDayThursday] = iCalWeekOccurrenceAll;
days[iCalWeekDayFriday] = iCalWeekOccurrenceAll;
days[iCalWeekDaySaturday] = 0;
o = [[self alloc] initWithDays: days];
d[iCalWeekDaySunday] = 0;
d[iCalWeekDayMonday] = iCalWeekOccurrenceAll;
d[iCalWeekDayTuesday] = iCalWeekOccurrenceAll;
d[iCalWeekDayWednesday] = iCalWeekOccurrenceAll;
d[iCalWeekDayThursday] = iCalWeekOccurrenceAll;
d[iCalWeekDayFriday] = iCalWeekOccurrenceAll;
d[iCalWeekDaySaturday] = 0;
o = [[self alloc] initWithDays: d];
AUTORELEASE(o);
return o;
@ -296,6 +296,8 @@
break;
case iCalWeekOccurrenceFifthLast: i = -5;
break;
case iCalWeekOccurrenceAll: i = 0;
break;
}
return i;

2
SOPE/NGCards/iCalDailyRecurrenceCalculator.m
View File

@ -189,10 +189,10 @@
lastInstanceStartDate = nil;
if ([rrule repeatCount] > 0)
{
firStart = [firstRange startDate];
if ([rrule hasByMask])
{
// Must perform the complete calculation
firStart = [firstRange startDate];
r = [NGCalendarDateRange calendarDateRangeWithStartDate: firStart
endDate: [NSCalendarDate distantFuture]];
instances = [self recurrenceRangesWithinCalendarDateRange: r];

2
SOPE/NGCards/iCalMonthlyRecurrenceCalculator.m
View File

@ -441,10 +441,10 @@ static inline unsigned iCalDoWForNSDoW (int dow)
lastInstanceStartDate = nil;
if ([rrule repeatCount] > 0)
{
firStart = [firstRange startDate];
if ([rrule hasByMask])
{
// Must perform the complete calculation
firStart = [firstRange startDate];
r = [NGCalendarDateRange calendarDateRangeWithStartDate: firStart
endDate: [NSCalendarDate distantFuture]];
instances = [self recurrenceRangesWithinCalendarDateRange: r];

2
SOPE/NGCards/iCalYearlyRecurrenceCalculator.m
View File

@ -241,10 +241,10 @@
lastInstanceStartDate = nil;
if ([rrule repeatCount] > 0)
{
firStart = [firstRange startDate];
if ([rrule hasByMask])
{
// Must perform the complete calculation
firStart = [firstRange startDate];
r = [NGCalendarDateRange calendarDateRangeWithStartDate: firStart
endDate: [NSCalendarDate distantFuture]];
instances = [self recurrenceRangesWithinCalendarDateRange: r];