Monotone-Parent: 41d1207879302957d2bb9e04793e78a7966863a0

Monotone-Revision: dc11ca564098f1f86ef07bafa645a1bc433e3cd7

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2007-06-14T21:23:14
Monotone-Branch: ca.inverse.sogo

UI/MailerUI/UIxMailEditor.m

@@ -40,7 +40,6 @@
 #import <SoObjects/Mailer/SOGoMailAccounts.h>
 #import <SoObjects/Mailer/SOGoMailIdentity.h>
 #import <SoObjects/SOGo/SOGoUser.h>
-#import <SoObjects/SOGo/WOContext+Agenor.h>
 #import <SOGoUI/UIxComponent.h>
 
 /*
@@ -226,19 +225,6 @@ static NSArray      *infoKeys            = nil;
   return [self labelForKey:@"Compose Mail"];
 }
 
-/* detect webmail being accessed from the outside */
-
-- (BOOL)isInternetRequest {
-  // DEPRECATED
-  return [[self context] isAccessFromIntranet] ? NO : YES;
-}
-
-- (BOOL)showInternetMarker {
-  if (!showInternetMarker)
-    return NO;
-  return [[self context] isAccessFromIntranet] ? NO : YES;
-}
-
 /* info loading */
 
 - (void)loadInfo:(NSDictionary *)_info {
@@ -507,7 +493,6 @@ static NSArray      *infoKeys            = nil;
 {
   NSException  *error;
   NSString     *mailPath;
-  NSDictionary *h;
   id <WOActionResults> result;
 
   // TODO: need to validate whether we have a To etc
@@ -529,12 +514,10 @@ static NSArray      *infoKeys            = nil;
   
   /* setup some extra headers if required */
   
-  h = [[self context] isAccessFromIntranet] ? nil : internetMailHeaders;
-  
   /* save mail to file (so that we can upload the mail to Cyrus) */
   // TODO: all this could be handled by the SOGoDraftObject?
   
-  mailPath = [[self clientObject] saveMimeMessageToTemporaryFileWithHeaders:h];
+  mailPath = [[self clientObject] saveMimeMessageToTemporaryFileWithHeaders: internetMailHeaders];
 
   /* then, send mail */