From 21de09a9f06048465272a3b9048cd63c1c398adc Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Mon, 17 Dec 2007 20:39:17 +0000 Subject: [PATCH] Monotone-Parent: 78bf08327def3b919404fee519b7ba663184b54e Monotone-Revision: 2ddf3577ff0d5f52e3f3dda10dce5e8c94f2421b Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2007-12-17T20:39:17 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 4 ++++ SoObjects/Mailer/SOGoDraftObject.m | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/ChangeLog b/ChangeLog index a2ac5c07d..9591f937b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2007-12-17 Wolfgang Sourdeau + * SoObjects/Mailer/SOGoDraftObject.m ([SOGoDraftObject + -fetchMailForForwarding:sourceMail]): append the signature to + mails forwarded as attachment. + * UI/MailPartViewers/UIxMailPartViewer.m ([UIxMailPartViewer -clientPart]): new method that returns the corresponding SOGoMailPart instance. diff --git a/SoObjects/Mailer/SOGoDraftObject.m b/SoObjects/Mailer/SOGoDraftObject.m index 8a9215627..2e210e011 100644 --- a/SoObjects/Mailer/SOGoDraftObject.m +++ b/SoObjects/Mailer/SOGoDraftObject.m @@ -634,6 +634,7 @@ static BOOL showTextAttachmentsInline = NO; { NSDictionary *info, *attachment; SOGoUser *currentUser; + NSString *signature; [sourceMail fetchCoreInfos]; @@ -659,6 +660,9 @@ static BOOL showTextAttachmentsInline = NO; { // TODO: use subject for filename? // error = [newDraft saveAttachment:content withName:@"forward.mail"]; + signature = [currentUser signature]; + if ([signature length]) + [self setText: [NSString stringWithFormat: @"\n-- \n%@", signature]]; attachment = [NSDictionary dictionaryWithObjectsAndKeys: [sourceMail filenameForForward], @"filename", @"message/rfc822", @"mimetype", @@ -666,6 +670,7 @@ static BOOL showTextAttachmentsInline = NO; [self saveAttachment: [sourceMail content] withMetadata: attachment]; } + [self storeInfo]; }