Monotone-Parent: 25c172f93ef4ab6ada0aeb6ff4267e98aef8b719

Monotone-Revision: 95af248444f21e7a45c7f512247840f4bf84e4bb

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2008-12-10T19:02:50
Monotone-Branch: ca.inverse.sogo

SOPE/NGCards/iCalWeeklyRecurrenceCalculator.m

@@ -185,25 +185,22 @@
   return ranges;
 }
 
-- (NSCalendarDate *) lastInstanceStartDate 
+- (NSCalendarDate *) lastInstanceStartDate
 {
+  NSCalendarDate *firStart, *lastInstanceStartDate;
+
   if ([rrule repeatCount] > 0) 
     {
-      long jnFirst, jnRuleLast;
-      NSCalendarDate *firStart, *until;
- 
       firStart = [firstRange startDate];
-      jnFirst = [firStart julianNumber];
-      jnRuleLast = ([rrule repeatInterval] *
-		    [rrule repeatCount] * 7) +
-	jnFirst;
-      until = [NSCalendarDate dateForJulianNumber: jnRuleLast];
-      until = [until hour: [firStart hourOfDay]
-		     minute: [firStart minuteOfHour]
-		     second: [firStart secondOfMinute]];
-      return until;
+
+      lastInstanceStartDate = [firStart dateByAddingYears: 0 months: 0
+					days: (7 * [rrule repeatInterval]
+					       * [rrule repeatCount])];
     }
-  return [super lastInstanceStartDate];
+  else
+    lastInstanceStartDate = [super lastInstanceStartDate];
+
+  return lastInstanceStartDate;
 }
 
 @end /* iCalWeeklyRecurrenceCalculator */