Monotone-Parent: 066bfc11f82275269e5bf2cc1cbbf0e9427e8d96

Monotone-Revision: 716ad11e755f3a78bb0353df886cf08096149a36

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2007-07-10T19:23:39
Monotone-Branch: ca.inverse.sogo

SoObjects/Mailer/SOGoMailAccount.m

@@ -175,49 +175,29 @@ static BOOL     useAltNamespace       = NO;
   return [creds objectAtIndex:0]; /* the user */
 }
 
-- (NSString *)imap4URLString {
-  /* private, overridden by SOGoSharedMailAccount */
-  NSString *s;
-  NSRange  r;
-  
-  s = [self nameInContainer];
-  r = [s rangeOfString:@"@"];
-  if (r.length == 0) {
-    NSString *u;
-    
-    u = [self imap4LoginFromHTTP];
-    if ([u length] == 0) {
-      [self errorWithFormat:@"missing login in account folder name: %@", s];
-      return nil;
-    }
-    s = [[u stringByAppendingString:@"@"] stringByAppendingString:s];
-  }
-  if ([s hasSuffix:@":80"]) { // HACK
-    [self logWithFormat:@"WARNING: incorrect value for IMAP4 URL: '%@'", s];
-    s = [s substringToIndex:([s length] - 3)];
-  }
-  
-  s = [([self useSSL] ? @"imaps://" : @"imap://") stringByAppendingString:s];
-  s = [s stringByAppendingString:@"/"];
-  return s;
-}
-
-- (NSURL *) imap4URL
+- (NSMutableString *) imap4URLString
 {
-  /* imap://agenortest@mail.opengroupware.org/ */
-  NSString *s;
- 
-  if (!imap4URL)
-    {
-      s = [self imap4URLString];
-      if (s)
-	imap4URL = [[NSURL alloc] initWithString: s];
-    }
- 
-  return imap4URL;
+  /* private, overridden by SOGoSharedMailAccount */
+  NSMutableString *urlString;
+  NSString *host;
+
+  urlString = [NSMutableString string];
+
+  if ([self useSSL])
+    [urlString appendString: @"imaps://"];
+  else
+    [urlString appendString: @"imap://"];
+
+  host = [self nameInContainer];
+  if (![host rangeOfString: @"@"].length)
+    [urlString appendFormat: @"%@@", [self imap4LoginFromHTTP]];
+  [urlString appendFormat: @"%@/", host];
+
+  return urlString;
 }
 
-- (NSString *)imap4Login {
+- (NSString *) imap4Login
+{
   return [[self imap4URL] user];
 }