LupusNobilis/sogo
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Monotone-Parent: 2ddf3577ff0d5f52e3f3dda10dce5e8c94f2421b

Browse source 
Monotone-Revision: aca422868e377bcf123be4fcaa0a258238b473a6

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2007-12-17T20:45:48
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau 2007-12-17 20:45:48 +00:00
parent 21de09a9f0
commit b62a6e9f7f
3 changed files with 22 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,5 +1,9 @@
2007-12-17 Wolfgang Sourdeau <wsourdeau@inverse.ca> 2007-12-17 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* UI/MailerUI/UIxMailEditor.m ([UIxMailEditor -attachmentNames]):
initialize "attachmentNames" if it was NOT initialized... I think
this was a typo.
* SoObjects/Mailer/SOGoDraftObject.m ([SOGoDraftObject * SoObjects/Mailer/SOGoDraftObject.m ([SOGoDraftObject
-fetchMailForForwarding:sourceMail]): append the signature to -fetchMailForForwarding:sourceMail]): append the signature to
mails forwarded as attachment. mails forwarded as attachment.

6
UI/MailerUI/UIxMailEditor.m
View file

@ -396,11 +396,11 @@ static NSArray *infoKeys = nil;
{ {
NSArray *a; NSArray *a;
if (attachmentNames) if (!attachmentNames)
{ {
a = [[self clientObject] fetchAttachmentNames]; a = [[self clientObject] fetchAttachmentNames];
a = [a sortedArrayUsingSelector: @selector (compare:)]; ASSIGN (attachmentNames,
attachmentNames = [a copy]; [a sortedArrayUsingSelector: @selector (compare:)]);
} }
return attachmentNames; return attachmentNames;

30
UI/Templates/MailerUI/UIxMailEditor.wox
View file

@ -23,15 +23,15 @@
</div> </div>
<form const:href="send" name="pageform" enctype="multipart/form-data"> <form const:href="send" name="pageform" enctype="multipart/form-data">
<div id="attachmentsArea"> <div id="attachmentsArea">
<var:string label:value="Attachments:" /> <var:string label:value="Attachments:" />
<ul id="attachments"> <ul id="attachments">
<var:foreach list="attachmentNames" item="attachmentName" <var:foreach list="attachmentNames" item="attachmentName"
><li><img rsrc:src="attachment.gif" ><li><img rsrc:src="attachment.gif"
/><var:string value="attachmentName" /><var:string value="attachmentName"
/></li></var:foreach> /></li></var:foreach>
</ul> </ul>
</div> </div>
<div id="headerArea"> <div id="headerArea">
<span class="headerField"><var:string label:value="From" />:</span> <span class="headerField"><var:string label:value="From" />:</span>
<var:popup const:name="from" <var:popup const:name="from"
@ -47,12 +47,12 @@
><span class="headerField"><var:string label:value="Subject" ><span class="headerField"><var:string label:value="Subject"
/>:</span />:</span
> >
<input name="subject" <input name="subject"
type="text" type="text"
class="textField" class="textField"
var:value="subject" var:value="subject"
/></div> /></div>
<!-- separator line --><hr/> <!-- separator line --><hr/>
</div> </div>
<textarea id="text" name="text" rows="30" var:value="text"/> <textarea id="text" name="text" rows="30" var:value="text"/>
<!-- img rsrc:src="tbird_073_compose.png" alt="screenshot" / --> <!-- img rsrc:src="tbird_073_compose.png" alt="screenshot" / -->