Monotone-Parent: 3a4de91fc3e2514ac5c72903d39f2c6522f4e044

Monotone-Revision: b5527cca41377fdda40add2bd6ca8f78f300fdef

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2007-11-01T20:20:57
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2007-11-01 20:20:57 +00:00
parent 4417a65f77
commit 650e3228aa
2 changed files with 10 additions and 2 deletions

View File

@@ -1,5 +1,9 @@
2007-11-01 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* SoObjects/Mailer/SOGoDraftObject.m ([SOGoDraftObject
-fetchMailForForwarding:sourceMail]): fetch attachments for
forwarded messages.
* UI/MailerUI/UIxMailListView.m ([UIxMailListView
-hasMessageAttachment]): initialize hasAttachment with "NO" to
avoid false positives.

View File

@@ -187,7 +187,7 @@ static BOOL showTextAttachmentsInline = NO;
if (headerValue)
[headers setObject: headerValue
forKey: headerKeys[count]];
else
else if ([headers objectForKey: headerKeys[count]])
[headers removeObjectForKey: headerKeys[count]];
}
@@ -569,7 +569,11 @@ static BOOL showTextAttachmentsInline = NO;
/* attach message */
currentUser = [context activeUser];
if ([[currentUser messageForwarding] isEqualToString: @"inline"])
[self setText: [sourceMail contentForInlineForward]];
{
[self setText: [sourceMail contentForInlineForward]];
[self _fetchAttachments: [sourceMail fetchFileAttachmentKeys]
fromMail: sourceMail];
}
else
{
// TODO: use subject for filename?