Monotone-Parent: 8268efeb15753e2949b09378244938f0b6bb08a8

Monotone-Revision: c0c1c6cf72acfbec9c8a2b4e7eeef2f801f49e54

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2006-09-29T18:31:20
Monotone-Branch: ca.inverse.sogo

UI/Scheduler/UIxAppointmentEditor.m

@@ -88,15 +88,14 @@
 
 @end
 
-#include "common.h"
-#include <NGCards/NGCards.h>
-#include <NGExtensions/NGCalendarDateRange.h>
-#include <SOGoUI/SOGoDateFormatter.h>
-#include <SOGo/AgenorUserManager.h>
-#include <Appointments/SOGoAppointmentFolder.h>
-#include <Appointments/SOGoAppointmentObject.h>
-#include "iCalPerson+UIx.h"
-#include "UIxComponent+Agenor.h"
+#import "common.h"
+#import <NGCards/NGCards.h>
+#import <NGExtensions/NGCalendarDateRange.h>
+#import <SOGoUI/SOGoDateFormatter.h>
+#import <SOGo/AgenorUserManager.h>
+#import <Appointments/SOGoAppointmentFolder.h>
+#import <Appointments/SOGoAppointmentObject.h>
+#import "UIxComponent+Agenor.h"
 
 @interface NSDate(UsedPrivates)
 - (NSString *)icalString; // TODO: this is in NGCards
@@ -849,7 +848,7 @@
   SOGoAppointmentObject *clientObject;
 
   clientObject = [self clientObject];
-  calendar = [clientObject calendarFromContent: _iCalString];
+  calendar = [iCalCalendar parseSingleFromSource: _iCalString];
   appointment = [clientObject firstEventFromCalendar: calendar];
 
   return appointment;
@@ -876,12 +875,11 @@
 
 /* access */
 
-- (BOOL)isMyApt {
-  if (organizer == nil)
-    return YES; // assume this is safe to do, right?
-  
+- (BOOL) isMyApt
+{
   // TODO: this should check a set of emails against the SoUser
-  return [[organizer rfc822Email] isEqualToString:[self emailForUser]];
+  return (![[organizer email] length]
+          || [[organizer rfc822Email] isEqualToString: [self emailForUser]]);
 }
 
 - (BOOL)canAccessApt {