Monotone-Parent: d0dc408cde2d2c26295711b91f59760222260c54
Monotone-Revision: 58118872a67f2415e728d474867cd19b9aa6f393 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2008-09-05T15:07:24 Monotone-Branch: ca.inverse.sogomaint-2.0.2
parent
3bf2abab41
commit
4c17603ab5
|
@ -1,5 +1,9 @@
|
|||
2008-09-05 Wolfgang Sourdeau <wsourdeau@inverse.ca>
|
||||
|
||||
* SoObjects/Mailer/SOGoMailObject+Draft.m ([SOGoMailObject
|
||||
-contentForReply]): if the reply style is outlook, then we use the
|
||||
content generated for inline forwarding.
|
||||
|
||||
* SoObjects/Mailer/SOGoMailFolder.m ([SOGoMailFolder
|
||||
-expungeLastMarkedFolder]): do not perform the expunge if the
|
||||
marked folder is the current folder.
|
||||
|
|
|
@ -40,8 +40,22 @@
|
|||
|
||||
#define maxFilenameLength 64
|
||||
|
||||
static BOOL inited = NO;
|
||||
static BOOL useOutlookStyleReplies = NO;
|
||||
|
||||
@implementation SOGoMailObject (SOGoDraftObjectExtensions)
|
||||
|
||||
+ (void) initialize
|
||||
{
|
||||
NSUserDefaults *ud;
|
||||
|
||||
if (!inited)
|
||||
{
|
||||
ud = [NSUserDefaults standardUserDefaults];
|
||||
useOutlookStyleReplies = [ud boolForKey: @"SOGoMailUseOutlookStyleReplies"];
|
||||
}
|
||||
}
|
||||
|
||||
- (NSString *) subjectForReply
|
||||
{
|
||||
static NSString *replyPrefixes[] = {
|
||||
|
@ -132,17 +146,23 @@
|
|||
- (NSString *) contentForReply
|
||||
{
|
||||
SOGoUser *currentUser;
|
||||
NSString *pageName;
|
||||
NSString *pageName, *content;
|
||||
SOGoMailReply *page;
|
||||
|
||||
if (useOutlookStyleReplies)
|
||||
content = [self contentForInlineForward];
|
||||
else
|
||||
{
|
||||
currentUser = [context activeUser];
|
||||
pageName = [NSString stringWithFormat: @"SOGoMail%@Reply",
|
||||
[currentUser language]];
|
||||
page = [[WOApplication application] pageWithName: pageName
|
||||
inContext: context];
|
||||
[page setRepliedMail: self];
|
||||
content = [[page generateResponse] contentAsString];
|
||||
}
|
||||
|
||||
return [[page generateResponse] contentAsString];
|
||||
return content;
|
||||
}
|
||||
|
||||
- (NSString *) filenameForForward
|
||||
|
|
Loading…
Reference in New Issue