From 98a48a1c53471e1dd80261fff84ccfe3bdfd99e0 Mon Sep 17 00:00:00 2001
From: Ludovic Marcotte <lmarcotte@inverse.ca>
Date: Tue, 20 Oct 2009 20:11:51 +0000
Subject: [PATCH] Fixed previous commit.

Monotone-Parent: 3088561b208f1a0f4711223d1f0e1265d7be03b2
Monotone-Revision: ffb403989e64c7ca37321c15ab24b50155dc2f68

Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2009-10-20T20:11:51
Monotone-Branch: ca.inverse.sogo
---
 SOPE/NGCards/iCalTimeZonePeriod.m | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/SOPE/NGCards/iCalTimeZonePeriod.m b/SOPE/NGCards/iCalTimeZonePeriod.m
index 1a724d649..855f7c8a2 100644
--- a/SOPE/NGCards/iCalTimeZonePeriod.m
+++ b/SOPE/NGCards/iCalTimeZonePeriod.m
@@ -99,12 +99,19 @@
   return dayOfWeek;
 }
 
+- (NSCalendarDate *) startDate
+{
+  return [(iCalDateTime *) [self uniqueChildWithTag: @"dtstart"]
+			   dateTime];
+}
+
 - (NSCalendarDate *) _occurenceForDate: (NSCalendarDate *) refDate
 			       byRRule: (iCalRecurrenceRule *) rrule
 {
   NSCalendarDate *tmpDate;
   NSString *byDay;
   int dayOfWeek, dateDayOfWeek, offset, pos;
+  NSCalendarDate *tzStart;
 
   byDay = [rrule namedValue: @"byday"];
   dayOfWeek = [self dayOfWeekFromRruleDay: [rrule byDayMask]];
@@ -113,9 +120,12 @@
     /* if byday = "SU", instead of "1SU"... */
     pos = 1;
 
+  tzStart = [self startDate];
+  [tzStart setTimeZone: [NSTimeZone timeZoneWithName: @"GMT"]];
   tmpDate = [NSCalendarDate dateWithYear: [refDate yearOfCommonEra]
 			    month: [[rrule namedValue: @"bymonth"] intValue]
-			    day: 1 hour: 0 minute: 0 second: 0
+			    day: 1 hour: [tzStart hourOfDay]
+			    minute: [tzStart minuteOfHour] second: 0
 			    timeZone: [NSTimeZone timeZoneWithName: @"GMT"]];
   tmpDate = [tmpDate addYear: 0 month: ((pos > 0) ? 0 : 1)
 		     day: 0 hour: 0 minute: 0
@@ -126,7 +136,7 @@
   if (pos > 0)
     offset = (dayOfWeek - dateDayOfWeek) + ((pos - 1) * 7);
   else
-    offset = (dayOfWeek - dateDayOfWeek) + ((pos + 1) * 7);
+    offset = (dayOfWeek - dateDayOfWeek) + (pos * 7);
 
   tmpDate = [tmpDate addYear: 0 month: 0 day: offset
 		     hour: 0 minute: 0 second: 0];