Monotone-Parent: 53787a178138e23c283a66af023cbddab3f3c417

Monotone-Revision: d74fd5d68d5fae10363904ec274b94033ae33c2c

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2007-11-19T22:44:12
Monotone-Branch: ca.inverse.sogo

SoObjects/Mailer/SOGoMailEnglishForward.wo/SOGoMailEnglishForward.html

@@ -6,3 +6,5 @@ From: <#from/>
 <#hasCc>CC: <#cc/></#hasCc><#hasNewsGroups>Newsgroups: <#newsgroups/></#hasNewsGroups><#hasReferences>References: <#references/></#hasReferences>
 
 <#messageBody/>
+
+<#signature/>

SoObjects/Mailer/SOGoMailEnglishForward.wo/SOGoMailEnglishForward.wod

@@ -67,3 +67,8 @@ messageBody: WOString {
   value = messageBody;
   escapeHTML = NO;
 }
+
+signature: WOString {
+  value = signature;
+  escapeHTML = NO;
+}

SoObjects/Mailer/SOGoMailEnglishReply.wo/SOGoMailEnglishReply.html

@@ -1,3 +1,5 @@
 On <#date/>, <#from/> wrote:
 
 <#messageBody/>
+
+<#signature/>

SoObjects/Mailer/SOGoMailEnglishReply.wo/SOGoMailEnglishReply.wod

@@ -12,3 +12,8 @@ messageBody: WOString {
   value = messageBody;
   escapeHTML = NO;
 }
+
+signature: WOString {
+  value = signature;
+  escapeHTML = NO;
+}

SoObjects/Mailer/SOGoMailForward.m

@@ -149,6 +149,19 @@
   return [sourceMail contentForEditing];
 }
 
+- (NSString *) signature
+{
+  NSString *signature, *mailSignature;
+
+  signature = [[context activeUser] signature];
+  if ([signature length])
+    mailSignature = [NSString stringWithFormat: @"--\r\n%@", signature];
+  else
+    mailSignature = @"";
+
+  return mailSignature;
+}
+
 @end
 
 @implementation SOGoMailEnglishForward

SoObjects/Mailer/SOGoMailFrenchForward.wo/SOGoMailFrenchForward.html

@@ -6,3 +6,5 @@ De: <#from/>
 <#hasCc>Copie: <#cc/></#hasCc><#hasNewsGroups>Forums de discussion: <#newsgroups/></#hasNewsGroups><#hasReferences>Références: <#references/></#hasReferences>
 
 <#messageBody/>
+
+<#signature/>

SoObjects/Mailer/SOGoMailFrenchForward.wo/SOGoMailFrenchForward.wod

@@ -67,3 +67,8 @@ messageBody: WOString {
   value = messageBody;
   escapeHTML = NO;
 }
+
+signature: WOString {
+  value = signature;
+  escapeHTML = NO;
+}

SoObjects/Mailer/SOGoMailFrenchReply.wo/SOGoMailFrenchReply.html

@@ -1,3 +1,5 @@
 Le <#date/>, <#from/> a écrit:
 
 <#messageBody/>
+
+<#signature/>

SoObjects/Mailer/SOGoMailFrenchReply.wo/SOGoMailFrenchReply.wod

@@ -12,3 +12,8 @@ messageBody: WOString {
   value = messageBody;
   escapeHTML = NO;
 }
+
+signature: WOString {
+  value = signature;
+  escapeHTML = NO;
+}

SoObjects/Mailer/SOGoMailGermanForward.wo/SOGoMailGermanForward.html

@@ -6,3 +6,5 @@ Sender: <#from/>
 <#hasCc>Kopie: <#cc/></#hasCc><#hasNewsGroups>Newsgroup: <#newsgroups/></#hasNewsGroups><#hasReferences>Referenzen: <#references/></#hasReferences>
 
 <#messageBody/>
+
+<#signature/>

SoObjects/Mailer/SOGoMailGermanForward.wo/SOGoMailGermanForward.wod

@@ -67,3 +67,8 @@ messageBody: WOString {
   value = messageBody;
   escapeHTML = NO;
 }
+
+signature: WOString {
+  value = signature;
+  escapeHTML = NO;
+}

SoObjects/Mailer/SOGoMailGermanReply.wo/SOGoMailGermanReply.html

@@ -1,3 +1,5 @@
 On <#date/>, <#from/> wrote:
 
 <#messageBody/>
+
+<#signature/>

SoObjects/Mailer/SOGoMailGermanReply.wo/SOGoMailGermanReply.wod

@@ -12,3 +12,8 @@ messageBody: WOString {
   value = messageBody;
   escapeHTML = NO;
 }
+
+signature: WOString {
+  value = signature;
+  escapeHTML = NO;
+}

SoObjects/Mailer/SOGoMailReply.m

@@ -73,6 +73,19 @@
   return [[sourceMail contentForEditing] stringByApplyingMailQuoting];
 }
 
+- (NSString *) signature
+{
+  NSString *signature, *mailSignature;
+
+  signature = [[context activeUser] signature];
+  if ([signature length])
+    mailSignature = [NSString stringWithFormat: @"--\r\n%@", signature];
+  else
+    mailSignature = @"";
+
+  return mailSignature;
+}
+
 @end
 
 @implementation SOGoMailEnglishReply