From bd948aa0e00f79a49e4d9bcca8321b9f9489791a Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Tue, 20 Apr 2010 20:29:59 +0000 Subject: [PATCH] Monotone-Parent: db9ec5b861b659354c77dd7978e1c7f78f92de3e Monotone-Revision: 3e7ab09417e0eb7a43c8f716a4a51471466afee8 Monotone-Author: flachapelle@inverse.ca Monotone-Date: 2010-04-20T20:29:59 Monotone-Branch: ca.inverse.sogo --- SOPE/NGCards/iCalByDayMask.m | 20 ++++++++++--------- SOPE/NGCards/iCalDailyRecurrenceCalculator.m | 2 +- .../NGCards/iCalMonthlyRecurrenceCalculator.m | 2 +- SOPE/NGCards/iCalYearlyRecurrenceCalculator.m | 2 +- 4 files changed, 14 insertions(+), 12 deletions(-) diff --git a/SOPE/NGCards/iCalByDayMask.m b/SOPE/NGCards/iCalByDayMask.m index 9eb313a4c..b586d66b6 100644 --- a/SOPE/NGCards/iCalByDayMask.m +++ b/SOPE/NGCards/iCalByDayMask.m @@ -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; diff --git a/SOPE/NGCards/iCalDailyRecurrenceCalculator.m b/SOPE/NGCards/iCalDailyRecurrenceCalculator.m index 2563baa36..1fa749048 100644 --- a/SOPE/NGCards/iCalDailyRecurrenceCalculator.m +++ b/SOPE/NGCards/iCalDailyRecurrenceCalculator.m @@ -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]; diff --git a/SOPE/NGCards/iCalMonthlyRecurrenceCalculator.m b/SOPE/NGCards/iCalMonthlyRecurrenceCalculator.m index a208291fb..274a2bd22 100644 --- a/SOPE/NGCards/iCalMonthlyRecurrenceCalculator.m +++ b/SOPE/NGCards/iCalMonthlyRecurrenceCalculator.m @@ -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]; diff --git a/SOPE/NGCards/iCalYearlyRecurrenceCalculator.m b/SOPE/NGCards/iCalYearlyRecurrenceCalculator.m index 210977a2e..d76f22d7b 100644 --- a/SOPE/NGCards/iCalYearlyRecurrenceCalculator.m +++ b/SOPE/NGCards/iCalYearlyRecurrenceCalculator.m @@ -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];