Monotone-Parent: 1be5732f06e2d40958dabf3dc0142cabc8ac4a21

Monotone-Revision: 052d83040e0d4ee5456c2ee8ef81f588178b384b

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2007-08-15T20:13:41
Monotone-Branch: ca.inverse.sogo

UI/Scheduler/UIxCalView.m

@@ -100,23 +100,20 @@ static BOOL shouldDisplayWeekend = NO;
 - (NSArray *) filterAppointments:(NSArray *) _apts
 {
   NSMutableArray *filtered;
-  unsigned i, count;
-  NSString *email;
-  NSDictionary *info;
-  NSArray *partmails;
-  unsigned p, pCount;
+  unsigned i, count, p, pCount;
+  NSString *email, *partmailsString, *state, *pEmail;
+  NSDictionary *info, *primaryIdentity;
+  NSArray *partmails, *partstates;
   BOOL shouldAdd;
-  NSString *partmailsString;
-  NSArray  *partstates;
-  NSString *state;
-  NSString *pEmail;
 
   if ([self shouldDisplayRejectedAppointments])
     return _apts;
   {
     count = [_apts count];
     filtered = [[[NSMutableArray alloc] initWithCapacity: count] autorelease];
-    email = [[context activeUser] primaryEmail];
+
+    primaryIdentity = [[context activeUser] primaryIdentity];
+    email = [primaryIdentity objectForKey: @"email"];
 
     for (i = 0; i < count; i++)
       {

UI/Scheduler/UIxComponentEditor.m

@@ -783,6 +783,7 @@
 {
   NSString *organizerEmail;
   SOGoUser *activeUser;
+  NSDictionary *primaryIdentity;
 
   organizerEmail = [[component organizer] email];
   if ([organizerEmail length] == 0)
@@ -791,8 +792,9 @@
 	{
 	  ASSIGN (organizer, [iCalPerson elementWithTag: @"organizer"]);
 	  activeUser = [context activeUser];
+	  primaryIdentity = [activeUser primaryIdentity];
 	  [organizer setCn: [activeUser cn]];
-	  [organizer setEmail: [activeUser primaryEmail]];
+	  [organizer setEmail: [primaryIdentity objectForKey: @"email"]];
 	  [component setOrganizer: organizer];
 	}
     }