From 171dfbfb3dad2a3da76e0b0c75fd103ffd97fec6 Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Wed, 12 Nov 2008 16:12:23 +0000
Subject: [PATCH] Monotone-Parent: aadd417d36fb0c041ee85a89145a87cc634d7aeb
 Monotone-Revision: ad53dc521ff4231b5a6c7a7185ce6deda193e7e8

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2008-11-12T16:12:23
Monotone-Branch: ca.inverse.sogo
---
 SoObjects/Appointments/SOGoAppointmentFolder.m |  2 +-
 SoObjects/Appointments/iCalEvent+SOGo.m        | 10 ++++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/SoObjects/Appointments/SOGoAppointmentFolder.m b/SoObjects/Appointments/SOGoAppointmentFolder.m
index 0b4a5f9dd..daf53f680 100644
--- a/SoObjects/Appointments/SOGoAppointmentFolder.m
+++ b/SoObjects/Appointments/SOGoAppointmentFolder.m
@@ -962,7 +962,7 @@ static Class sogoAppointmentFolderKlass = Nil;
     }
 
   /* fetch recurrent apts now. we do NOT consider events with no cycle end. */
-  if (_endDate)
+  if (_endDate || filters)
     {
       sql = [NSString stringWithFormat: @"(c_iscycle = 1) %@ %@ %@ %@", titleSqlString,
 		      componentSqlString, privacySqlString, filterSqlString];
diff --git a/SoObjects/Appointments/iCalEvent+SOGo.m b/SoObjects/Appointments/iCalEvent+SOGo.m
index bd542a20e..68bcf1fce 100644
--- a/SoObjects/Appointments/iCalEvent+SOGo.m
+++ b/SoObjects/Appointments/iCalEvent+SOGo.m
@@ -41,10 +41,16 @@
 - (BOOL) isStillRelevant
 {
   NSCalendarDate *now;
-
+  BOOL isStillRelevent;
+  
   now = [NSCalendarDate calendarDate];
 
-  return ([[self endDate] earlierDate: now] == now);
+  if ([self isRecurrent])
+      isStillRelevent = ([[self lastPossibleRecurrenceStartDate] earlierDate: now] == now);
+  else
+      isStillRelevent = ([[self endDate] earlierDate: now] == now);
+  
+  return isStillRelevent;
 }
 
 - (NSMutableDictionary *) quickRecord