See Changelog.

Monotone-Parent: f638868d7db65b1617476f06e76394a24bca8310
Monotone-Revision: c2f49ba857d8dcdda22d3395cb073bf99a040d49

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2011-01-18T03:07:38
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Francis Lachapelle
2011-01-18 03:07:38 +00:00
parent ab94153bfc
commit c3d4250b6f
2 changed files with 11 additions and 3 deletions
+6
View File
@@ -1,3 +1,9 @@
2011-01-17 Francis Lachapelle <flachapelle@inverse.ca>
* SoObjects/Appointments/SOGoEMailAlarmsManager.m
(-_lookupEntityMatchingRecord:inCalendar:): We check if
recurrenceId is nil prior calling -timeIntervalSince1970.
2011-01-14 Francis Lachapelle <flachapelle@inverse.ca>
* SoObjects/Appointments/iCalRepeatableEntityObject+SOGo.m
@@ -207,8 +207,9 @@
inCalendar: (iCalCalendar *) calendar
{
NSArray *entities;
NSCalendarDate *testRecId;
iCalEntityObject *entity, *testEntity;
int count, max, testRecId;
int count, max, testRecIdSecs;
entities = [calendar events];
max = [entities count];
@@ -224,8 +225,9 @@
for (count = 0; !entity && count < max; count++)
{
testEntity = [entities objectAtIndex: count];
testRecId = (int) [[testEntity recurrenceId] timeIntervalSince1970];
if ([[record objectForKey: @"c_recurrence_id"] intValue] == testRecId)
testRecId = [testEntity recurrenceId];
testRecIdSecs = testRecId? [[testEntity recurrenceId] timeIntervalSince1970] : 0;
if ([[record objectForKey: @"c_recurrence_id"] intValue] == testRecIdSecs)
entity = testEntity;
}
}