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

See ChangeLog

Browse Source 
Monotone-Parent: c9d83319c3cc894c26d31f564f3d4722c49c590e
Monotone-Revision: 9b486432ba55fa5e9a8bf8f7172fe57752abf7e1

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2011-03-30T02:14:56
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Francis Lachapelle
2011-03-30 02:14:56 +00:00
parent 13229c7ad2
commit d384c3be99
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@@ -1,3 +1,9 @@
2011-03-30 Francis Lachapelle <flachapelle@inverse.ca>
* SoObjects/Appointments/SOGoAppointmentFolder.m
(-fetchFreeBusyInfosFrom:to:): we must fetch the c_content in
order to flatten cyclic events.
2011-03-29 Francis Lachapelle <flachapelle@inverse.ca>
* SoObjects/Appointments/iCalEvent+SOGo.m

11
SoObjects/Appointments/SOGoAppointmentFolder.m
View File

@@ -882,7 +882,7 @@ firstInstanceCalendarDateRange: (NGCalendarDateRange *) fir
[row setObject: sharedYes forKey: @"isRecurrentEvent"];
content = [theRecord objectForKey: @"c_content"];
if ([content length])
if ([content isNotNull])
{
elements = [iCalCalendar parseFromSource: content];
if ([elements count])
@@ -941,7 +941,9 @@ firstInstanceCalendarDateRange: (NGCalendarDateRange *) fir
}
}
}
else
[self errorWithFormat:@"cyclic record doesn't have content -> %@", theRecord];
max = [ranges count];
for (count = 0; count < max; count++)
{
@@ -1125,6 +1127,7 @@ firstInstanceCalendarDateRange: (NGCalendarDateRange *) fir
qualifier = [EOQualifier qualifierWithQualifierFormat:
[where substringFromIndex: 4]];
records = [folder fetchFields: fields matchingQualifier: qualifier];
if (records)
{
if (r)
@@ -1144,7 +1147,7 @@ firstInstanceCalendarDateRange: (NGCalendarDateRange *) fir
{
if (r)
records = [self _flattenCycleRecords: records fetchRange: r];
if (ma)
if (ma)
[ma addObjectsFromArray: records];
else
ma = [NSMutableArray arrayWithArray: records];
@@ -2226,7 +2229,7 @@ firstInstanceCalendarDateRange: (NGCalendarDateRange *) fir
static NSArray *infos = nil; // TODO: move to a plist file
if (!infos)
infos = [[NSArray alloc] initWithObjects: @"c_partmails", @"c_partstates",
infos = [[NSArray alloc] initWithObjects: @"c_content", @"c_partmails", @"c_partstates",
@"c_isopaque", @"c_status", @"c_cycleinfo", @"c_orgmail", nil];
// We MUST include the protected information when checking for freebusy info as