From b8ee55c062675017dfd3db43181a677e9ee51aca Mon Sep 17 00:00:00 2001
From: helge <helge@d1b88da0-ebda-0310-925b-ed51d893ca5b>
Date: Tue, 19 Jul 2005 09:15:25 +0000
Subject: [PATCH] cleanups

git-svn-id: http://svn.opengroupware.org/SOGo/trunk@817 d1b88da0-ebda-0310-925b-ed51d893ca5b
---
 SOGo/UI/MailerUI/ChangeLog            |  9 +++++++++
 SOGo/UI/MailerUI/UIxMailAccountView.m |  1 +
 SOGo/UI/MailerUI/UIxMailEditor.m      | 28 +++++++--------------------
 SOGo/UI/MailerUI/Version              |  2 +-
 4 files changed, 18 insertions(+), 22 deletions(-)

diff --git a/SOGo/UI/MailerUI/ChangeLog b/SOGo/UI/MailerUI/ChangeLog
index 09144172..6d039ef8 100644
--- a/SOGo/UI/MailerUI/ChangeLog
+++ b/SOGo/UI/MailerUI/ChangeLog
@@ -1,3 +1,12 @@
+2005-07-19  Helge Hess  <helge.hess@opengroupware.org>
+
+	* v0.9.151
+
+	* UIxMailAccountView.m: fixed a warning
+
+	* UIxMailEditor.m: removed SOGoInternetDetectQualifier code (reuse
+	  shared Internet-detect functionality)
+
 2005-07-18  Helge Hess  <helge.hess@opengroupware.org>
 
 	* UIxMailMainFrame.m: create a proper form action URL which preserves
diff --git a/SOGo/UI/MailerUI/UIxMailAccountView.m b/SOGo/UI/MailerUI/UIxMailAccountView.m
index f6377686..b3aeb7cf 100644
--- a/SOGo/UI/MailerUI/UIxMailAccountView.m
+++ b/SOGo/UI/MailerUI/UIxMailAccountView.m
@@ -29,6 +29,7 @@
 @end
 
 #include <NGObjWeb/SoObject+SoDAV.h>
+#include <SoObjects/Mailer/SOGoMailFolder.h>
 #include "common.h"
 
 @interface NSString(DotCutting)
diff --git a/SOGo/UI/MailerUI/UIxMailEditor.m b/SOGo/UI/MailerUI/UIxMailEditor.m
index 33272222..f6caf20a 100644
--- a/SOGo/UI/MailerUI/UIxMailEditor.m
+++ b/SOGo/UI/MailerUI/UIxMailEditor.m
@@ -55,15 +55,13 @@
 
 @implementation UIxMailEditor
 
-static BOOL         keepMailTmpFile    = NO;
-static BOOL         showInternetMarker = NO;
-static EOQualifier  *internetDetectQualifier = nil;
-static NSDictionary *internetMailHeaders     = nil;
-static NSArray      *infoKeys = nil;
+static BOOL         keepMailTmpFile      = NO;
+static BOOL         showInternetMarker   = NO;
+static NSDictionary *internetMailHeaders = nil;
+static NSArray      *infoKeys            = nil;
 
 + (void)initialize {
   NSUserDefaults *ud = [NSUserDefaults standardUserDefaults];
-  NSString *s;
   
   infoKeys = [[NSArray alloc] initWithObjects:
 				@"subject", @"text", @"to", @"cc", @"bcc", 
@@ -82,19 +80,6 @@ static NSArray      *infoKeys = nil;
 	  @"(SOGoShowInternetMarker)");
   }
   
-  if ((s = [ud stringForKey:@"SOGoInternetDetectQualifier"]) != nil) {
-    internetDetectQualifier = 
-      [[EOQualifier qualifierWithQualifierFormat:s] retain];
-    if (internetDetectQualifier == nil)
-      NSLog(@"UIxMailEditor: could not parse qualifier: '%@'", s);
-  }
-  if (internetDetectQualifier == nil)
-    NSLog(@"UIxMailEditor: no 'SOGoInternetDetectQualifier' configured.");
-  else {
-    NSLog(@"UIxMailEditor: detect Internet access using: %@", 
-	  internetDetectQualifier);
-  }
-  
   internetMailHeaders = 
     [[ud dictionaryForKey:@"SOGoInternetMailHeaders"] copy];
   NSLog(@"Note: specified %d headers for mails send via the Internet.", 
@@ -212,13 +197,14 @@ static NSArray      *infoKeys = nil;
 /* detect webmail being accessed from the outside */
 
 - (BOOL)isInternetRequest {
+  // DEPRECATED
   return [[self context] isAccessFromIntranet] ? NO : YES;
 }
 
 - (BOOL)showInternetMarker {
   if (!showInternetMarker)
     return NO;
-  return [self isInternetRequest];
+  return [[self context] isAccessFromIntranet] ? NO : YES;
 }
 
 /* info loading */
@@ -367,7 +353,7 @@ static NSArray      *infoKeys = nil;
   
   /* setup some extra headers if required */
   
-  h = [self isInternetRequest] ? internetMailHeaders : nil;
+  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?
diff --git a/SOGo/UI/MailerUI/Version b/SOGo/UI/MailerUI/Version
index fda36ee2..f08b177e 100644
--- a/SOGo/UI/MailerUI/Version
+++ b/SOGo/UI/MailerUI/Version
@@ -1,6 +1,6 @@
 # version file
 
-SUBMINOR_VERSION:=150
+SUBMINOR_VERSION:=151
 
 # v0.9.140 requires SoObjects/Mailer v0.9.100
 # v0.9.134 requires libSOGo          v0.9.41
-- 
2.39.5