Monotone-Parent: 5f2a3e7eefe739c0e656450e9cc85846e27c80b8

Monotone-Revision: 3239b46c1626108a2b1a3d6cab30ae4c9bd6a731

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2007-11-13T22:38:05
Monotone-Branch: ca.inverse.sogo

UI/MailPartViewers/UIxMailPartICalViewer.m

@@ -292,22 +292,24 @@
 
 - (iCalEvent *) authorativeEvent
 {
-  /* DB is considered master, when in DB, ignore mail organizer */
-  return [self isEventStoredInCalendar]
-    ? [self storedEvent]
-    : [self inEvent];
+  iCalEvent *authorativeEvent;
+
+  if ([[self storedEvent] compare: [self inEvent]]
+      == NSOrderedAscending)
+    authorativeEvent = inEvent;
+  else
+    authorativeEvent = storedEventObject;
+
+  return authorativeEvent;
 }
 
 - (BOOL) isLoggedInUserTheOrganizer
 {
-  NSString *loginEMail;
+  iCalPerson *organizer;
  
-  if ((loginEMail = [self loggedInUserEMail]) == nil) {
-    [self warnWithFormat:@"Could not determine email of logged in user?"];
-    return NO;
-  }
- 
-  return [[self authorativeEvent] isOrganizer:loginEMail];
+  organizer = [[self authorativeEvent] organizer];
+
+  return [[context activeUser] hasEmail: [organizer rfc822Email]];
 }
 
 - (BOOL) isLoggedInUserAnAttendee