Monotone-Parent: f90d169fbc251326ea6c8a2f620e125a8a7b4168

Monotone-Revision: 7786f49f6724383b92e91ba7998b99cfb52ceec3

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-04-20T13:27:21

SoObjects/Mailer/SOGoDraftObject.m

@@ -269,7 +269,7 @@ static NSString    *userAgent      = nil;
 {
   id headerValue;
   unsigned int count;
-  NSString *messageID, *priority, *pureSender;
+  NSString *messageID, *priority, *pureSender,*replyTo;
 
   for (count = 0; count < 8; count++)
     {
@@ -310,6 +310,13 @@ static NSString    *userAgent      = nil;
       [headers setObject: @"5 (Lowest)"  forKey: @"X-Priority"];
     }
 
+  replyTo = [headers objectForKey: @"replyTo"];
+  if ([replyTo length] > 0)
+    {
+      [headers setObject: replyTo forKey: @"reply-to"];
+      [headers removeObjectForKey: @"replyTo"];
+    }
+
   if ([[newHeaders objectForKey: @"receipt"] isEqualToString: @"true"])
     {
       pureSender = [[newHeaders objectForKey: @"from"] pureEMailAddress];
@@ -1361,7 +1368,7 @@ static NSString    *userAgent      = nil;
   NSString *s, *dateString;
   NGMutableHashMap *map;
   NSArray *emails;
-  id from;
+  id from, replyTo;
   
   map = [[[NGMutableHashMap alloc] initWithCapacity:16] autorelease];
   
@@ -1383,6 +1390,9 @@ static NSString    *userAgent      = nil;
       [map setObject: [self _quoteSpecials: from] forKey: @"from"];
   }
 
+  if (replyTo = [headers objectForKey: @"reply-to"])
+    [map setObject: replyTo forKey: @"reply-to"];
+
   if (inReplyTo)
     [map setObject: inReplyTo forKey: @"in-reply-to"];
 

SoObjects/SOGo/SOGoUser.m

@@ -576,8 +576,8 @@
 
 - (void) _appendSystemMailAccount
 {
-  NSString *fullName, *imapLogin, *imapServer, *signature, *encryption,
-    *scheme, *action, *query;
+  NSString *fullName, *replyTo, *imapLogin, *imapServer, *signature,
+    *encryption, *scheme, *action, *query;
   NSMutableDictionary *mailAccount, *identity, *mailboxes, *receipts;
   NSNumber *port;
   NSMutableArray *identities;
@@ -642,6 +642,8 @@
   mails = [self allEmails];
   [mailAccount setObject: [mails objectAtIndex: 0] forKey: @"name"];
 
+  replyTo = [_defaults mailReplyTo];
+
   max = [mails count];
   if (max > 1)
     max--;
@@ -653,6 +655,10 @@
         fullName = login;
       [identity setObject: fullName forKey: @"fullName"];
       [identity setObject: [mails objectAtIndex: count] forKey: @"email"];
+
+      if ([replyTo length] > 0)
+        [identity setObject: replyTo forKey: @"replyTo"];
+
       signature = [_defaults mailSignature];
       if (signature)
         [identity setObject: signature forKey: @"signature"];

SoObjects/SOGo/SOGoUserDefaults.h

@@ -130,6 +130,9 @@ extern NSString *SOGoWeekStartFirstFullWeek;
 - (void) setMailSignaturePlacement: (NSString *) newValue;
 - (NSString *) mailSignaturePlacement;
 
+- (void) setMailReplyTo: (NSString *) newValue;
+- (NSString *) mailReplyTo;
+
 - (void) setAllowUserReceipt: (BOOL) allow;
 - (BOOL) allowUserReceipt;
 - (void) setUserReceiptNonRecipientAction: (NSString *) action;

SoObjects/SOGo/SOGoUserDefaults.m

@@ -531,6 +531,18 @@ NSString *SOGoWeekStartFirstFullWeek = @"FirstFullWeek";
   return signaturePlacement;
 }
 
+- (void) setMailReplyTo: (NSString *) newValue
+{
+  if ([newValue length] == 0)
+    newValue = nil;
+  [self setObject: newValue forKey: @"SOGoMailReplyTo"];
+}
+
+- (NSString *) mailReplyTo
+{
+  return [self stringForKey: @"SOGoMailReplyTo"];
+}
+
 - (void) setAllowUserReceipt: (BOOL) allow
 {
   [self setBool: allow forKey: @"SOGoMailReceiptAllow"];