propagate from branch 'ca.inverse.sogo.1_3_11' (head 9c4be3d7d32f456638c073296f3c3b84ca2f6ea9)

to branch 'ca.inverse.sogo' (head 83063c0c69ff54ec2fbc43e2dd50c1c6a80bcf1a)

Monotone-Parent: 83063c0c69ff54ec2fbc43e2dd50c1c6a80bcf1a
Monotone-Parent: 9c4be3d7d32f456638c073296f3c3b84ca2f6ea9
Monotone-Revision: 2f66e7e50e9a88d5279a512e70f1bd7c6c5c6531

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2011-12-06T17:38:57
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2011-12-06 17:38:57 +00:00
2 changed files with 12 additions and 4 deletions
+3
View File
@@ -1,5 +1,8 @@
2011-12-06 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* SoObjects/Appointments/iCalEvent+SOGo.m (-firstOccurrenceRange):
same as below.
* SoObjects/Appointments/SOGoAppointmentFolder.m
(_flattenCycleRecord:forRange:intoArray:): reverted to retrieving
the event start date using the old and buggy method, adapted to
+9 -4
View File
@@ -274,14 +274,19 @@
{
NSCalendarDate *start, *end;
NGCalendarDateRange *firstRange;
NSArray *dates;
firstRange = nil;
start = [self startDate];
end = [start addTimeInterval: [self occurenceInterval]];
dates = [[[self uniqueChildWithTag: @"dtstart"] valuesForKey: @""] lastObject];
if ([dates count] > 0)
{
start = [[dates lastObject] asCalendarDate];
end = [start addTimeInterval: [self occurenceInterval]];
firstRange = [NGCalendarDateRange calendarDateRangeWithStartDate: start
endDate: end];
firstRange = [NGCalendarDateRange calendarDateRangeWithStartDate: start
endDate: end];
}
return firstRange;
}