From 15302bbf73c6d34eab0b0a022089ea58c79116c6 Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Wed, 22 Aug 2007 15:18:01 +0000
Subject: [PATCH] Monotone-Parent: 088d781f2222b451b13ed0a3faf660935d3f18da
 Monotone-Revision: 8ca28dddfefbcc2bdfd2324a0733b3f9e72fb413

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2007-08-22T15:18:01
Monotone-Branch: ca.inverse.sogo
---
 ChangeLog                                     |  7 ++++++
 UI/PreferencesUI/UIxPreferences.m             | 22 +++++++++++++++++++
 UI/Templates/PreferencesUI/UIxPreferences.wox |  7 ++++++
 3 files changed, 36 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 00bc76dec..6a5addd2a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2007-08-22  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* UI/PreferencesUI/UIxPreferences.m ([UIxPreferences -messageForwardingList])
+	([UIxPreferences -itemMessageForwardingText])
+	([UIxPreferences -userMessageForwarding])
+	([UIxPreferences -setUserMessageForwarding:newMessageForwarding]):
+	new template methods for manage the user preference regarding
+	message forwarding.
+
 	* SoObjects/SOGo/SOGoUser.m ([SOGoUser -language]): change the
 	algorithm to return, in order, the user's defined language or the
 	first browser language or, finally, the default language.
diff --git a/UI/PreferencesUI/UIxPreferences.m b/UI/PreferencesUI/UIxPreferences.m
index 4fb12e88d..4131db0a5 100644
--- a/UI/PreferencesUI/UIxPreferences.m
+++ b/UI/PreferencesUI/UIxPreferences.m
@@ -419,6 +419,28 @@ static BOOL shouldDisplayPasswordChange = NO;
   [userDefaults setObject: newTime forKey: @"ReminderTime"];
 }
 
+/* Mailer */
+- (NSArray *) messageForwardingList
+{
+  return [NSArray arrayWithObjects: @"inline", @"attached", nil];
+}
+
+- (NSString *) itemMessageForwardingText
+{
+  return [self labelForKey:
+		 [NSString stringWithFormat: @"messageforward_%@", item]];
+}
+
+- (NSString *) userMessageForwarding
+{
+  return [user messageForwarding];
+}
+
+- (void) setUserMessageForwarding: (NSString *) newMessageForwarding
+{
+  [userDefaults setObject: newMessageForwarding forKey: @"MessageForwarding"];
+}
+
 - (id <WOActionResults>) defaultAction
 {
   id <WOActionResults> results;
diff --git a/UI/Templates/PreferencesUI/UIxPreferences.wox b/UI/Templates/PreferencesUI/UIxPreferences.wox
index 6d97ce4a3..c941cf91f 100644
--- a/UI/Templates/PreferencesUI/UIxPreferences.wox
+++ b/UI/Templates/PreferencesUI/UIxPreferences.wox
@@ -19,6 +19,8 @@
 	    label:value="Date and Time"/></li>
 	<li target="calendarOptionsView"><var:string
 	    label:value="Calendar Options"/></li>
+	<li target="mailOptionsView"><var:string
+	    label:value="Mail Options"/></li>
 	<var:if condition="shouldDisplayPasswordChange">
 	  <li target="passwordView"><var:string label:value="Password"/></li>
 	</var:if>
@@ -89,6 +91,11 @@
 	  <var:popup list="reminderTimesList" item="item"
 	    string="itemReminderTimeText" selection="userReminderTime"/></label>
       </div>
+      <div id="mailOptionsView" class="tab">
+	<label><var:string label:value="Forward messages:"/>
+	  <var:popup list="messageForwardingList" item="item"
+	    string="itemMessageForwardingText" selection="userMessageForwarding"/></label><br/>
+      </div>
       <var:if condition="shouldDisplayPasswordChange">
 	<div id="passwordView" class="tab">
 	  <label><var:string label:value="New password:"