From 334fbc3a265e70f788e5beb44997b52778cd70aa Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Tue, 1 Nov 2011 20:45:59 +0000
Subject: [PATCH] Monotone-Parent: 1e8c7259f7ef4e643e8c4d7691e6d7b69faa65c3
 Monotone-Revision: ca32e7014fbdeca8576a2cd0926f5921a097e971

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2011-11-01T20:45:59
Monotone-Branch: ca.inverse.sogo
---
 ChangeLog                             |  3 +++
 OpenChange/MAPIStoreCalendarMessage.m | 25 +++++++++++++++++++++----
 2 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 38d3bcff3..09e770858 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2011-11-01  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* OpenChange/MAPIStoreCalendarMessage.m (-save): added work-around
+	for setting of organizer as an attendee record.
+
 	* OpenChange/MAPIStoreMailMessage.m (-setReadFlag:): implemented
 	basic method, only dealing with actual setting or unsetting of
 	"\Seen".
diff --git a/OpenChange/MAPIStoreCalendarMessage.m b/OpenChange/MAPIStoreCalendarMessage.m
index 70efa4585..0b5f39ad0 100644
--- a/OpenChange/MAPIStoreCalendarMessage.m
+++ b/OpenChange/MAPIStoreCalendarMessage.m
@@ -799,10 +799,11 @@
         {
           NSArray *recipients;
           NSDictionary *dict;
+          NSString *orgEmail, *attEmail;
           iCalPerson *person;
           iCalPersonPartStat newPartStat;
           NSNumber *flags, *trackStatus;
-          int i;
+          int i, effective;
 
           /* We must set the organizer preliminarily here because, unlike what
              the doc states, Outlook does not always pass the real organizer
@@ -810,15 +811,28 @@
           dict = [activeUser primaryIdentity];
           person = [iCalPerson new];
           [person setCn: [dict objectForKey: @"fullName"]];
-          [person setEmail: [dict objectForKey: @"email"]];
+          orgEmail = [dict objectForKey: @"email"];
+          [person setEmail: orgEmail];
           [newEvent setOrganizer: person];
           [person release];
 
           recipients = [value objectForKey: @"to"];
-      
+          effective = 0;
           for (i = 0; i < [recipients count]; i++)
             {
               dict = [recipients objectAtIndex: i];
+              attEmail = [dict objectForKey: @"email"];
+
+              /* Work-around: it happens that Outlook still passes the
+                 organizer as a recipient, maybe because of a feature
+                 documented in a pre-mesozoic PDF still buried in a cavern...
+                 In that case we remove it, and we keep the number of
+                 effective recipients in "effective". If the total is 0, we
+                 remove the "ORGANIZER" too. */
+              if ([attEmail isEqualToString: orgEmail])
+                continue;
+
+              effective++;
               flags = [dict objectForKey: MAPIPropertyKey (PR_RECIPIENT_FLAGS)];
               if (!flags)
                 {
@@ -828,7 +842,7 @@
 
               person = [iCalPerson new];
               [person setCn: [dict objectForKey: @"fullName"]];
-              [person setEmail: [dict objectForKey: @"email"]];
+              [person setEmail: attEmail];
 
               if (([flags unsignedIntValue] & 0x0002)) /* recipOrganizer */
                 [newEvent setOrganizer: person];
@@ -861,6 +875,9 @@
                   [newEvent addToAttendees: person];
                 }
 
+              if (effective == 0) /* See work-around above */
+                [newEvent setOrganizer: nil];
+
               [person release];
             }
         }