From 988779e0982ca920f1d1161df1f46336e0c170b8 Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Fri, 19 Jun 2009 15:17:12 +0000 Subject: [PATCH] Monotone-Parent: 3a06415372a1a1f51b286861a4ab3a51dd7df886 Monotone-Revision: dd40f80285290c9b934e5644f0e30ea7b3ef0577 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2009-06-19T15:17:12 Monotone-Branch: ca.inverse.sogo --- SoObjects/Appointments/SOGoAppointmentFolder.m | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/SoObjects/Appointments/SOGoAppointmentFolder.m b/SoObjects/Appointments/SOGoAppointmentFolder.m index e7607b2e7..218f745c7 100644 --- a/SoObjects/Appointments/SOGoAppointmentFolder.m +++ b/SoObjects/Appointments/SOGoAppointmentFolder.m @@ -1469,7 +1469,8 @@ firstInstanceCalendarDateRange: (NGCalendarDateRange *) fir NSString *currentKey, *keyField, *filterString; static NSArray *fields = nil; NSMutableArray *filters; - NSNumber *cycle, *cEndDate; + NSCalendarDate *cEndDate; + NSNumber *cycle; #warning the list of fields should be taken from the .ocs description file if (!fields) @@ -1503,11 +1504,11 @@ firstInstanceCalendarDateRange: (NGCalendarDateRange *) fir if ([cycle intValue]) { cEndDate = [filter objectForKey: @"cycleenddate"]; - if ([cEndDate intValue]) + if (cEndDate) { filterString = [NSString stringWithFormat: @"(c_cycleenddate = NULL OR c_cycleenddate >= %@)", - cEndDate]; + (int) [cEndDate timeIntervalSince1970]]; [filters addObject: filterString]; } }