git-svn-id: http://svn.opengroupware.org/SOGo/inverse/trunk@1398 d1b88da0-ebda-0310...

diff --git a/SOPE/NGCards/ChangeLog b/SOPE/NGCards/ChangeLog
index 434420f921c3d46e56511d0a10d1bd28e43b8ae3..3263427f1afaf88b4724613581c80a8e2ad93c7c 100644 (file)
--- a/SOPE/NGCards/ChangeLog
+++ b/SOPE/NGCards/ChangeLog
@@ -1,3 +1,11 @@
+2008-04-02  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+       * 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  <wsourdeau@inverse.ca>
 
        * iCalRecurrenceRule.m ([iCalRecurrenceRule -byMonthDay]): check

diff --git a/SOPE/NGCards/iCalRecurrenceCalculator.m b/SOPE/NGCards/iCalRecurrenceCalculator.m
index c3e9b8ed320ceea3d27b991393cac9800feebce5..b946bdbca8ccdd6e827c1b9a5350ca4c9b4e1644 100644 (file)
--- 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 d7f6c6b71b639be480be7a99968bac06c7addba3..4fea87a1bbf79fe810241141b63af77e048b1061 100644 (file)
--- 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"];
 }