Monotone-Parent: eab6dcca819997db03071b70fa3cb43b3b72b73a

Monotone-Revision: f25d9e23cbc813e28cebdd2d055817c45444b3b3

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2006-11-07T18:15:42
Monotone-Branch: ca.inverse.sogo

SoObjects/Appointments/SOGoAppointmentObject.m

@@ -103,21 +103,25 @@ static NSString                  *mailTemplateDefaultLanguage = nil;
   return [self contentAsString];
 }
 
-- (iCalEvent *)event {
-  NSString  *iCalString;
+- (iCalEvent *) event
+{
   iCalEvent *event;
+  iCalCalendar *calendar;
+  NSString *iCalString;
 
   iCalString = [self iCalString];
-  if ([iCalString length] > 0) {
-    iCalCalendar *cal;
+  if (iCalString)
+    {
+      calendar = [iCalCalendar parseSingleFromSource: iCalString];
+      if (calendar)
+        event = [self firstEventFromCalendar: calendar];
+      else
+        event = nil;
+    }
+  else
+    event = nil;
 
-    [parser parseFromSource:iCalString];
-    cal   = [sax rootObject];
-    [sax reset];
-    event = [[cal events] lastObject];
-    return event;
-  }
-  return nil;
+  return event;
 }
 
 /* iCal handling */

SoObjects/Appointments/SOGoTaskObject.m

@@ -255,11 +255,18 @@ static NSString                  *mailTemplateDefaultLanguage = nil;
 {
   iCalToDo *event;
   NSArray *events;
+  NSString *iCalString;
 
-  events = [calendar childrenWithTag: @"vtodo"];
-  if ([events count])
-    event = (iCalToDo *) [[events objectAtIndex: 0]
-                            groupWithClass: [iCalToDo class]];
+  iCalString = [self iCalString];
+  if (iCalString)
+    {
+      events = [calendar childrenWithTag: @"vtodo"];
+      if ([events count])
+        event = (iCalToDo *) [[events objectAtIndex: 0]
+                               groupWithClass: [iCalToDo class]];
+      else
+        event = nil;
+    }
   else
     event = nil;