From 6df9451d0423c9a3204dd57adc09b40c49dc6b15 Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Wed, 2 Apr 2008 14:17:53 +0000 Subject: [PATCH] SoObjects Monotone-Parent: b0aeecf5f2a6ed3d4404fe7b4a5215a87c47032a Monotone-Revision: fd565bb36a2ef3a33d5549a38f33d77802404317 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2008-04-02T14:17:53 Monotone-Branch: ca.inverse.sogo --- SOPE/NGCards/ChangeLog | 8 ++++++++ SOPE/NGCards/iCalRecurrenceCalculator.m | 7 ++----- SoObjects/SOGo/SOGoGCSFolder.m | 1 + 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/SOPE/NGCards/ChangeLog b/SOPE/NGCards/ChangeLog index 434420f92..3263427f1 100644 --- a/SOPE/NGCards/ChangeLog +++ b/SOPE/NGCards/ChangeLog @@ -1,3 +1,11 @@ +2008-04-02 Wolfgang Sourdeau + + * iCalRecurrenceCalculator.m ([iCalRecurrenceCalculator + +recurrenceRangesWithinCalendarDateRange:_rfirstInstanceCalendarDateRange:_firrecurrenceRules:_rRulesexceptionRules:_exRulesexceptionDates:_exDates]): + when removing dates, the decremental count of dates to remove was + actually incremental, which caused an out of bound reference + exception. + 2008-03-26 Wolfgang Sourdeau * iCalRecurrenceRule.m ([iCalRecurrenceRule -byMonthDay]): check diff --git a/SOPE/NGCards/iCalRecurrenceCalculator.m b/SOPE/NGCards/iCalRecurrenceCalculator.m index c3e9b8ed3..b946bdbca 100644 --- a/SOPE/NGCards/iCalRecurrenceCalculator.m +++ b/SOPE/NGCards/iCalRecurrenceCalculator.m @@ -194,14 +194,11 @@ static Class yearlyCalcClass = Nil; maxRanges = [ranges count]; dates = [[self _dates: exdates withinRange: limits] objectEnumerator]; while ((currentDate = [dates nextObject])) - for (count = (maxRanges - 1); count > -1; count++) + for (count = (maxRanges - 1); count > -1; count--) { currentRange = [ranges objectAtIndex: count]; if ([currentRange containsDate: currentDate]) - { - [ranges removeObjectAtIndex: count]; - maxRanges--; - } + [ranges removeObjectAtIndex: count]; } } diff --git a/SoObjects/SOGo/SOGoGCSFolder.m b/SoObjects/SOGo/SOGoGCSFolder.m index d7f6c6b71..4fea87a1b 100644 --- a/SoObjects/SOGo/SOGoGCSFolder.m +++ b/SoObjects/SOGo/SOGoGCSFolder.m @@ -74,6 +74,7 @@ static BOOL sendFolderAdvisories = NO; NSUserDefaults *ud; ud = [NSUserDefaults standardUserDefaults]; + sendFolderAdvisories = [ud boolForKey: @"SOGoFoldersSendEMailNotifications"]; }