amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-03-04 22:56:24 +00:00
Code Issues Projects Releases Wiki Activity

Fixed previous commit.

Browse Source 
Monotone-Parent: 3088561b208f1a0f4711223d1f0e1265d7be03b2
Monotone-Revision: ffb403989e64c7ca37321c15ab24b50155dc2f68

Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2009-10-20T20:11:51
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Ludovic Marcotte
2009-10-20 20:11:51 +00:00
parent 4074fef5dc
commit 98a48a1c53
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
SOPE/NGCards/iCalTimeZonePeriod.m
View File

@@ -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];