Monotone-Parent: 2448001ef69730541ee1c822cf80c131176b1ed0

Monotone-Revision: e5a4a8243c282c12538ab38c9b5c23722be35e99

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2011-11-09T20:47:08
Monotone-Branch: ca.inverse.sogo

OpenChange/MAPIStoreCalendarMessage.m

@@ -46,6 +46,7 @@
 #import <Appointments/SOGoAppointmentFolder.h>
 #import <Appointments/SOGoAppointmentObject.h>
 #import <Appointments/iCalEntityObject+SOGo.h>
+#import <Mailer/NSString+Mail.h>
 
 #import "MAPIStoreAppointmentWrapper.h"
 #import "MAPIStoreCalendarAttachment.h"
@@ -241,6 +242,12 @@
   return [[self appointmentWrapper] getPrImportance: data inMemCtx: memCtx];
 }
 
+- (int) getPrBody: (void **) data
+         inMemCtx: (TALLOC_CTX *) memCtx
+{
+  return [[self appointmentWrapper] getPrBody: data inMemCtx: memCtx];
+}
+
 - (int) getPidLidIsRecurring: (void **) data
                     inMemCtx: (TALLOC_CTX *) memCtx
 {
@@ -797,6 +804,22 @@
 	      [newEvent setTransparency: @"OPAQUE"];
 	    }
 	}
+
+      /* Comment */
+      value = [properties objectForKey: MAPIPropertyKey (PR_BODY_UNICODE)];
+      if (!value)
+        {
+          value = [properties objectForKey: MAPIPropertyKey (PR_HTML)];
+          if (value)
+            {
+              value = [[NSString alloc] initWithData: value
+                                        encoding: NSUTF8StringEncoding];
+              [value autorelease];
+              value = [value htmlToText];
+            }
+        }
+      if (value)
+        [newEvent setComment: value];
       
       /* recurrence */
       value = [properties