Monotone-Parent: d690ff1fe2dd685ce9e4e5a8773578c039ec1bf4

Monotone-Revision: be3f824ea546882828787185ebfdd086e3742f87

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2007-04-11T19:17:20
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2007-04-11 19:17:20 +00:00
parent 5ff3a45095
commit 48f210e151
7 changed files with 13 additions and 46 deletions
+2 -4
View File
@@ -344,7 +344,6 @@ static NSString *fromInternetSuffixPattern = nil;
{
NSDictionary *lInfo;
NGMimeMessage *message;
WOContext *ctx;
NSString *fromInternetSuffix;
BOOL addSuffix;
id body;
@@ -352,12 +351,11 @@ static NSString *fromInternetSuffixPattern = nil;
if ((lInfo = [self fetchInfo]) == nil)
return nil;
ctx = [[WOApplication application] context];
addSuffix = [ctx isAccessFromIntranet] ? NO : YES;
addSuffix = [context isAccessFromIntranet] ? NO : YES;
if (addSuffix) {
fromInternetSuffix =
[fromInternetSuffixPattern stringByReplacingVariablesWithBindings:
[ctx request]
[context request]
stringForUnknownBindings:@""];
addSuffix = [fromInternetSuffix length] > 0 ? YES : NO;