From 7a5da6bcdcae6296fcc4d3a07b990ad08e9e307f Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Wed, 7 Mar 2007 22:33:27 +0000
Subject: [PATCH] Monotone-Parent: 0d1504b25805aa0a62ce9ead611227d57b4d4f75
 Monotone-Revision: e2612f65bcad1f3bf690e9591362c3fcf8825a80

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2007-03-07T22:33:27
Monotone-Branch: ca.inverse.sogo
---
 UI/MailerUI/UIxMailReplyAction.m | 33 ++++++++++++++++++++------------
 1 file changed, 21 insertions(+), 12 deletions(-)

diff --git a/UI/MailerUI/UIxMailReplyAction.m b/UI/MailerUI/UIxMailReplyAction.m
index cb00981f3..5d278097d 100644
--- a/UI/MailerUI/UIxMailReplyAction.m
+++ b/UI/MailerUI/UIxMailReplyAction.m
@@ -19,16 +19,16 @@
   02111-1307, USA.
 */
 
-#include "UIxMailEditorAction.h"
+#import "UIxMailEditorAction.h"
 
 @interface UIxMailReplyAction : UIxMailEditorAction
 @end
 
-#include <SoObjects/Mailer/SOGoMailObject.h>
-#include <SoObjects/Mailer/SOGoDraftObject.h>
-#include <NGImap4/NGImap4EnvelopeAddress.h>
-#include <NGImap4/NGImap4Envelope.h>
-#include "common.h"
+#import <SoObjects/Mailer/SOGoMailObject.h>
+#import <SoObjects/Mailer/SOGoDraftObject.h>
+#import <NGImap4/NGImap4EnvelopeAddress.h>
+#import <NGImap4/NGImap4Envelope.h>
+#import "common.h"
 
 @implementation UIxMailReplyAction
 
@@ -110,18 +110,19 @@
   }
 }
 
-- (NSString *)contentForReplyOnParts:(NSDictionary *)_prts keys:(NSArray *)_k {
+- (NSString *) contentForReplyOnParts: (NSDictionary *) _prts
+                                 keys: (NSArray *) _k
+{
   static NSString *textPartSeparator = @"\n---\n";
   NSMutableString *ms;
   unsigned i, count;
   
   ms = [NSMutableString stringWithCapacity:16000];
-  
   for (i = 0, count = [_k count]; i < count; i++) {
     NSString *k, *v;
     
     k = [_k objectAtIndex:i];
-    
+   
     // TODO: this is DUP code to SOGoMailObject
     if ([k isEqualToString:@"body[text]"])
       k = @"";
@@ -145,10 +146,18 @@
 }
 
 - (NSString *)contentForReply {
-  NSArray      *keys;
-  NSDictionary *parts;
-  
+  NSArray      *keys, *partInfos;
+  NSDictionary *parts, *infos;
+
   keys = [[self clientObject] plainTextContentFetchKeys];
+//   SOGoMailObject *co;
+
+//   co = [self clientObject];
+//   keys = [co plainTextContentFetchKeys];
+//   infos = [co fetchCoreInfos];
+//   partInfos = [infos objectForKey: keys];
+//   NSLog (@"infos: '%@'", infos);
+
   if ([keys count] == 0)
     return nil;