From a054f0d5470ccd0501d199197a8967cdff0f8c67 Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Thu, 24 Feb 2011 20:15:57 +0000
Subject: [PATCH] Monotone-Parent: c2917386cf94357b49f5e5a5a2546c5d884cd132
 Monotone-Revision: e14d9f62a6ec2d7e8788ee6cf73d4a47312b8531

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2011-02-24T20:15:57
Monotone-Branch: ca.inverse.sogo
---
 ChangeLog                          |  5 +++++
 SoObjects/SOGo/SOGoContentObject.h |  5 -----
 SoObjects/SOGo/SOGoContentObject.m | 18 ++++--------------
 3 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index fd1db4860..f50277721 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2011-02-24  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* SoObjects/SOGo/SOGoContentObject.m (-davContentLength): return 0
+	when "content" is nil to avoid a value of "(nil)".
+	(-setMAPIContent:, -MAPIContent): removed obsolete methods (fixed
+	hack).
+
 	* SoObjects/Mailer/SOGoMailObject.m (_hasFlag:): put the flags in
 	a cache to avoid multiple queries.
 
diff --git a/SoObjects/SOGo/SOGoContentObject.h b/SoObjects/SOGo/SOGoContentObject.h
index af838b3d0..ea8ca594c 100644
--- a/SoObjects/SOGo/SOGoContentObject.h
+++ b/SoObjects/SOGo/SOGoContentObject.h
@@ -35,7 +35,6 @@
 {
   BOOL isNew;
   NSString *content;
-  NSString *MAPIContent;
   unsigned int version;
   NSCalendarDate *creationDate;
   NSCalendarDate *lastModified;
@@ -76,10 +75,6 @@
 - (NSString *) davLastModified;
 - (NSString *) davContentLength;
 
-/* MAPI support */
-- (NSString *) MAPIContent;
-- (void) setMAPIContent: (NSString *) theContent;
-
 @end
 
 @interface SOGoContentObject (OptionalMethods)
diff --git a/SoObjects/SOGo/SOGoContentObject.m b/SoObjects/SOGo/SOGoContentObject.m
index ca3981bef..44a459227 100644
--- a/SoObjects/SOGo/SOGoContentObject.m
+++ b/SoObjects/SOGo/SOGoContentObject.m
@@ -142,7 +142,6 @@
 - (void) dealloc
 {
   [content release];
-  [MAPIContent release];
   [creationDate release];
   [lastModified release];
   [super dealloc];
@@ -379,7 +378,10 @@
      http://www.sogo.nu/bugs/view.php?id=915:
 
      length = [content lengthOfBytesUsingEncoding: NSUTF8StringEncoding]; */
-  length = strlen ([content UTF8String]);
+  if (content)
+    length = strlen ([content UTF8String]);
+  else
+    length = 0;
 
   return [NSString stringWithFormat: @"%u", length];
 }
@@ -481,16 +483,4 @@
   return @"<default>";
 }
 
-/* MAPI support */
-- (NSString *) MAPIContent
-{
-  return MAPIContent;
-}
-
-- (void) setMAPIContent: (NSString *) theContent
-{
-  ASSIGN(MAPIContent, theContent);
-}
-
-
 @end /* SOGoContentObject */