Monotone-Parent: d4ec4c64b7bfb4975be1924516e870493eb766a2

Monotone-Revision: 64bb41288f025d8a85a54ff9d3fa322dc9a6f5bd

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2006-09-28T17:19:55
Monotone-Branch: ca.inverse.sogo

Protocols/iCalHTTP/SOGoICalFileFetch.m

@@ -19,7 +19,13 @@
   02111-1307, USA.
 */
 
-#include <NGObjWeb/WODirectAction.h>
+#import <NGObjWeb/WODirectAction.h>
+#import "SOGoICalHTTPHandler.h"
+#import <SoObjects/Appointments/SOGoAppointmentFolder.h>
+
+#import <NGCards/iCalEvent.h>
+
+#import "common.h"
 
 @interface SOGoICalFileFetch : WODirectAction
 {
@@ -27,11 +33,6 @@
 
 @end
 
-#include "SOGoICalHTTPHandler.h"
-#include <SoObjects/Appointments/SOGoAppointmentFolder.h>
-#include <SOGo/SOGoAppointment.h>
-#include "common.h"
-
 @implementation SOGoICalFileFetch
 
 /* clientObject */
@@ -45,7 +46,7 @@
 - (id)defaultAction {
   NSAutoreleasePool *pool;
   WOResponse      *response;
-  SOGoAppointment *event;
+  iCalEvent *event;
   NSEnumerator    *e;
   NSArray         *events;
 
@@ -65,9 +66,8 @@
   events = [[self clientObject] fetchAllSOGoAppointments];
   [self debugWithFormat:@"generate %d appointments ...", [events count]];
   e = [events objectEnumerator];
-  while ((event = [e nextObject]) != nil) {
-    [response appendContentString:[event vEventString]];
-  }
+  while ((event = [e nextObject]) != nil)
+    [response appendContentString: [event versitString]];
 
   /* vcal postamble */
   [response appendContentString:@"END:VCALENDAR\r\n"];