From e05939e8a04c7d547c5430c01d15acf4d73d8b2a Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Tue, 6 Dec 2011 17:38:40 +0000
Subject: [PATCH] Monotone-Parent: f1a929eda62ac5fe22596efe98c5a812783f90c5
 Monotone-Revision: 9c4be3d7d32f456638c073296f3c3b84ca2f6ea9

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2011-12-06T17:38:40
---
 ChangeLog                               |  3 +++
 SoObjects/Appointments/iCalEvent+SOGo.m | 13 +++++++++----
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9a24e2ee1..03a7b49cc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2011-12-06  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* SoObjects/Appointments/iCalEvent+SOGo.m (-firstOccurrenceRange):
+	same as below.
+
 	* SoObjects/Appointments/SOGoAppointmentFolder.m
 	(_flattenCycleRecord:forRange:intoArray:): reverted to retrieving
 	the event start date using the old and buggy method, adapted to
diff --git a/SoObjects/Appointments/iCalEvent+SOGo.m b/SoObjects/Appointments/iCalEvent+SOGo.m
index cd4315a50..29fa11dc7 100644
--- a/SoObjects/Appointments/iCalEvent+SOGo.m
+++ b/SoObjects/Appointments/iCalEvent+SOGo.m
@@ -274,14 +274,19 @@
 {
   NSCalendarDate *start, *end;
   NGCalendarDateRange *firstRange;
+  NSArray *dates;
 
   firstRange = nil;
 
-  start = [self startDate];
-  end = [start addTimeInterval: [self occurenceInterval]];
+  dates = [[[self uniqueChildWithTag: @"dtstart"] valuesForKey: @""] lastObject];
+  if ([dates count] > 0)
+    {
+      start = [[dates lastObject] asCalendarDate];
+      end = [start addTimeInterval: [self occurenceInterval]];
 
-  firstRange = [NGCalendarDateRange calendarDateRangeWithStartDate: start
-                                                           endDate: end];
+      firstRange = [NGCalendarDateRange calendarDateRangeWithStartDate: start
+                                                               endDate: end];
+    }
   
   return firstRange;
 }