From 41b571478b67d0be07ec1ddbbaaf23261a1fc0ca Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Fri, 30 Mar 2007 18:09:55 +0000
Subject: [PATCH] Monotone-Parent: 1511bbd8b48b40b0958416f6289e1bd49b1bbb9a
 Monotone-Revision: 6769f7dd857ae4175092be6d7ab427e0eb095388

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2007-03-30T18:09:55
Monotone-Branch: ca.inverse.sogo
---
 UI/MailPartViewers/UIxMailPartICalViewer.m | 37 +++++++++++++---------
 1 file changed, 22 insertions(+), 15 deletions(-)

diff --git a/UI/MailPartViewers/UIxMailPartICalViewer.m b/UI/MailPartViewers/UIxMailPartICalViewer.m
index 0cac3f1bc..f8a0e549a 100644
--- a/UI/MailPartViewers/UIxMailPartICalViewer.m
+++ b/UI/MailPartViewers/UIxMailPartICalViewer.m
@@ -135,6 +135,18 @@
   return self->attendee;
 }
 
+- (NSString *) _personForDisplay: (iCalPerson *) person
+{
+  return [NSString stringWithFormat: @"%@ <%@>",
+		   [person cnWithoutQuotes],
+		   [person rfc822Email]];
+}
+
+- (NSString *) attendeeForDisplay
+{
+  return [self _personForDisplay: attendee];
+}
+
 - (void)setItem:(id)_item {
   ASSIGN(self->item, _item);
 }
@@ -252,23 +264,18 @@
 
 /* derived fields */
 
-- (NSString *)organizerDisplayName {
+- (NSString *) organizerDisplayName
+{
   iCalPerson *organizer;
-  NSString   *cn;
-  
-  if ((organizer = [[self authorativeEvent] organizer]) != nil) {
-    cn = [organizer valueForKey:@"cnWithoutQuotes"];
-    if ([cn isNotNull] && [cn length] > 0)
-      return cn;
-    
-    cn = [organizer valueForKey:@"rfc822Email"];
-    if ([cn isNotNull] && [cn length] > 0)
-      return cn;
-    
-    return @"[error: unable to derive organizer name]";
-  }
+  NSString *value;
 
-  return @"[todo: no organizer set, use 'from']";
+  organizer = [[self authorativeEvent] organizer];
+  if (organizer)
+    value = [self _personForDisplay: organizer];
+  else
+    value = @"[todo: no organizer set, use 'from']";
+
+  return value;
 }
 
 /* replies */