See ChangeLog

Monotone-Parent: 54b01b70fe55f24f29ed00a93826637acb076c5f
Monotone-Revision: b35d04c6cd2614e48feea1b1dacb0a61aa27fe44

Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2010-11-08T16:49:52
Monotone-Branch: ca.inverse.sogo
maint-2.0.2
Ludovic Marcotte 2010-11-08 16:49:52 +00:00
parent 2646e93e5f
commit 50a2cd8994
2 changed files with 10 additions and 2 deletions

View File

@ -1,3 +1,9 @@
2010-11-08 Ludovic Marcotte <lmarcotte@inverse.ca>
* SOPE/GDLContentStore/GCSAlarmsFolder.m
We now check for non-nil values before calling
-timeInterval...
2010-11-08 Francis Lachapelle <flachapelle@inverse.ca>
* UI/WebServerResources/SOGoDragHandles.js (adjust): for vertical

View File

@ -326,8 +326,10 @@ static NSString *alarmsFolderURLString = nil;
{
NSNumber *tRecId, *tADate;
tRecId = [NSNumber numberWithInt: (int) [recId timeIntervalSince1970]];
tADate = [NSNumber numberWithInt: (int) [alarmDate timeIntervalSince1970]];
// We check if recId and alarmDate are nil prior calling -timeIntervalSince1970
// Weird gcc optimizations can cause issue here.
tRecId = [NSNumber numberWithInt: (recId ? (int)[recId timeIntervalSince1970] : 0)];
tADate = [NSNumber numberWithInt: (alarmDate ? (int)[alarmDate timeIntervalSince1970] : 0)];
return [NSDictionary dictionaryWithObjectsAndKeys: cname, @"c_name",
path, @"c_path",