Monotone-Parent: 998f8668c2a6175352cb3f2d659db5aa04b0fa39

Monotone-Revision: eb80137abbc0c0a426a654921250804b1c3d92ab

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2008-02-07T23:09:12
Monotone-Branch: ca.inverse.sogo

SoObjects/SOGo/SOGoUser.m

@@ -454,16 +454,14 @@ NSString *SOGoWeekStartFirstFullWeek = @"FirstFullWeek";
 {
   NSMutableDictionary *mailAccount, *identity;
   NSMutableArray *identities;
-  NSString *name, *fullName, *userName;
+  NSString *name, *fullName;
   NSArray *mails;
   unsigned int count, max;
 
   mailAccount = [NSMutableDictionary dictionary];
-  userName = [[login stringByReplacingString: @"@" withString: @"%40"]
-	       stringByEscapingURL];
   name = [NSString stringWithFormat: @"%@@%@",
-		   userName, fallbackIMAP4Server];
-  [mailAccount setObject: userName forKey: @"userName"];
+		   login, fallbackIMAP4Server];
+  [mailAccount setObject: login forKey: @"userName"];
   [mailAccount setObject: fallbackIMAP4Server forKey: @"serverName"];
   [mailAccount setObject: name forKey: @"name"];
 
@@ -509,6 +507,23 @@ NSString *SOGoWeekStartFirstFullWeek = @"FirstFullWeek";
   return mailAccounts;
 }
 
+- (NSDictionary *) accountWithName: (NSString *) accountName;
+{
+  NSEnumerator *accounts;
+  NSDictionary *mailAccount, *currentAccount;
+
+  mailAccount = nil;
+
+  accounts = [[self mailAccounts] objectEnumerator];
+  while (!mailAccount
+	 && ((currentAccount = [accounts nextObject])))
+    if ([[currentAccount objectForKey: @"name"]
+	  isEqualToString: accountName])
+      mailAccount = currentAccount;
+
+  return mailAccount;
+}
+
 /*
 @interface SOGoMailIdentity : NSObject
 {