From 631a72b2230165df8d64f81f67a5b753568a8ecf Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Wed, 19 Oct 2011 13:58:22 +0000
Subject: [PATCH] Monotone-Parent: 56f1fa4190879117f1a79ceb54d70f4fa769ce40
 Monotone-Revision: 30df56fed6201e5630b76375285bd214a212211a

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2011-10-19T13:58:22
Monotone-Branch: ca.inverse.sogo
---
 ChangeLog                           |  5 +++++
 OpenChange/MAPIStoreDraftsMessage.m | 20 ++++++++++++++++++++
 OpenChange/MAPIStoreMailMessage.h   |  4 ++++
 3 files changed, 29 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index b30102e9b..d9c52c637 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-10-19  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* OpenChange/MAPIStoreDraftsMessage.m (-getPrDisplayTo:inMemCtx:)
+	(-getPrDisplayBcc:inMemCtx:): new getters.
+
 2011-10-18  Francis Lachapelle  <flachapelle@inverse.ca>
 
 	* UI/WebServerResources/generic.js (log): fixed an issue with
diff --git a/OpenChange/MAPIStoreDraftsMessage.m b/OpenChange/MAPIStoreDraftsMessage.m
index aba42dac4..abd529bd1 100644
--- a/OpenChange/MAPIStoreDraftsMessage.m
+++ b/OpenChange/MAPIStoreDraftsMessage.m
@@ -532,6 +532,16 @@ e)
           : [super getPrReceivedByEmailAddress: data inMemCtx: memCtx]);
 }
 
+- (int) getPrDisplayTo: (void **) data
+              inMemCtx: (TALLOC_CTX *) memCtx
+{
+  return ([sogoObject isKindOfClass: SOGoDraftObjectK]
+          ? [self _getAddressHeader: data
+                         addressKey: @"to"
+                           inMemCtx: memCtx]
+          : [super getPrDisplayTo: data inMemCtx: memCtx]);
+}
+
 - (int) getPrDisplayCc: (void **) data
               inMemCtx: (TALLOC_CTX *) memCtx
 {
@@ -542,6 +552,16 @@ e)
           : [super getPrDisplayCc: data inMemCtx: memCtx]);
 }
 
+- (int) getPrDisplayBcc: (void **) data
+               inMemCtx: (TALLOC_CTX *) memCtx
+{
+  return ([sogoObject isKindOfClass: SOGoDraftObjectK]
+          ? [self _getAddressHeader: data
+                         addressKey: @"cc"
+                           inMemCtx: memCtx]
+          : [super getPrDisplayBcc: data inMemCtx: memCtx]);
+}
+
 - (NSArray *) attachmentKeysMatchingQualifier: (EOQualifier *) qualifier
                              andSortOrderings: (NSArray *) sortOrderings
 {
diff --git a/OpenChange/MAPIStoreMailMessage.h b/OpenChange/MAPIStoreMailMessage.h
index d1893e723..675f7e970 100644
--- a/OpenChange/MAPIStoreMailMessage.h
+++ b/OpenChange/MAPIStoreMailMessage.h
@@ -63,8 +63,12 @@
                            inMemCtx: (TALLOC_CTX *) memCtx;
 - (int) getPrSenderEmailAddress: (void **) data
                        inMemCtx: (TALLOC_CTX *) memCtx;
+- (int) getPrDisplayTo: (void **) data
+              inMemCtx: (TALLOC_CTX *) memCtx;
 - (int) getPrDisplayCc: (void **) data
               inMemCtx: (TALLOC_CTX *) memCtx;
+- (int) getPrDisplayBcc: (void **) data
+               inMemCtx: (TALLOC_CTX *) memCtx;
 
 @end