Monotone-Parent: f0283ca70db031586d1105d8d042333fb67911d2
Monotone-Revision: 37e598aeb2b79c619bb99d9295a63f9ad757d3c7 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2011-04-05T15:11:34 Monotone-Branch: ca.inverse.sogomaint-2.0.2
parent
9f48d79d20
commit
32f139a710
|
@ -855,9 +855,6 @@ firstInstanceCalendarDateRange: (NGCalendarDateRange *) fir
|
|||
iCalTimeZone *eventTimeZone;
|
||||
unsigned count, max, offset;
|
||||
|
||||
records = [NSMutableArray array];
|
||||
ranges = nil;
|
||||
|
||||
content = [theRecord objectForKey: @"c_cycleinfo"];
|
||||
if (![content isNotNull])
|
||||
{
|
||||
|
@ -933,17 +930,12 @@ firstInstanceCalendarDateRange: (NGCalendarDateRange *) fir
|
|||
}
|
||||
|
||||
// Calculate the occurrences for the given range
|
||||
records = [NSMutableArray array];
|
||||
ranges = [iCalRecurrenceCalculator recurrenceRangesWithinCalendarDateRange: recurrenceRange
|
||||
firstInstanceCalendarDateRange: firstRange
|
||||
recurrenceRules: rules
|
||||
exceptionRules: exRules
|
||||
exceptionDates: exDates];
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
[self errorWithFormat:@"cyclic record doesn't have content -> %@", theRecord];
|
||||
|
||||
max = [ranges count];
|
||||
for (count = 0; count < max; count++)
|
||||
{
|
||||
|
@ -963,6 +955,11 @@ firstInstanceCalendarDateRange: (NGCalendarDateRange *) fir
|
|||
|
||||
[theRecords addObjectsFromArray: records];
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
[self errorWithFormat:@"cyclic record doesn't have content -> %@", theRecord];
|
||||
}
|
||||
|
||||
- (NSArray *) _flattenCycleRecords: (NSArray *) _records
|
||||
fetchRange: (NGCalendarDateRange *) _r
|
||||
|
|
|
@ -139,8 +139,10 @@ static SoSecurityManager *sm = nil;
|
|||
SOGoWebAppointmentFolder *webCalendar;
|
||||
NSString *name;
|
||||
|
||||
if (![self newFolderWithName: folderDisplayName
|
||||
if ([self newFolderWithName: folderDisplayName
|
||||
nameInContainer: &name])
|
||||
webCalendar = nil;
|
||||
else
|
||||
{
|
||||
aptFolder = [subFolders objectForKey: name];
|
||||
[aptFolder setFolderPropertyValue: url
|
||||
|
|
|
@ -211,6 +211,8 @@
|
|||
iCalEntityObject *entity, *testEntity;
|
||||
int count, max, testRecIdSecs;
|
||||
|
||||
entity = nil;
|
||||
|
||||
entities = [calendar events];
|
||||
max = [entities count];
|
||||
if (max == 0)
|
||||
|
@ -221,7 +223,6 @@
|
|||
|
||||
if (max > 0)
|
||||
{
|
||||
entity = nil;
|
||||
for (count = 0; !entity && count < max; count++)
|
||||
{
|
||||
testEntity = [entities objectAtIndex: count];
|
||||
|
|
Loading…
Reference in New Issue