git-svn-id: http://svn.opengroupware.org/SOGo/inverse/trunk@1362 d1b88da0-ebda-0310...

diff --git a/SoObjects/Mailer/SOGoMailAccount.m b/SoObjects/Mailer/SOGoMailAccount.m
index 69cefa26109ca8cee335c8627af9a7fb50d7068b..357b77023d79e86a6ee2617848d15fa8c18388eb 100644 (file)
--- a/SoObjects/Mailer/SOGoMailAccount.m
+++ b/SoObjects/Mailer/SOGoMailAccount.m
@@ -28,8 +28,9 @@
 #import <NGObjWeb/SoHTTPAuthenticator.h>
 #import <NGObjWeb/WORequest.h>
 #import <NGObjWeb/WOContext+SoObjects.h>
-#import <NGExtensions/NSObject+Logs.h>
 #import <NGExtensions/NSNull+misc.h>
+#import <NGExtensions/NSObject+Logs.h>
+#import <NGExtensions/NSString+misc.h>
 #import <NGImap4/NGImap4Connection.h>
 #import <NGImap4/NGImap4Client.h>
 #import <NGImap4/NGImap4Context.h>
@@ -248,7 +249,7 @@ static NSString *otherUsersFolderName = @""; // TODO: add English default
 - (NSString *) urlHostString
 {
   NSDictionary *mailAccount;
-  NSString *username, *escUsername, hostString;
+  NSString *username, *escUsername, *hostString;
 
   mailAccount = [[context activeUser] accountWithName: nameInContainer];
   if (mailAccount)

diff --git a/SoObjects/SOGo/SOGoUser.h b/SoObjects/SOGo/SOGoUser.h
index 6a5e89c6cf2e0ca1fe70c787124cb5c7b15db90e..03c067cea19dbe88ea4240c6697bb78d190f4ae8 100644 (file)
--- a/SoObjects/SOGo/SOGoUser.h
+++ b/SoObjects/SOGo/SOGoUser.h
@@ -118,7 +118,7 @@ extern NSString *SOGoWeekStartFirstFullWeek;
 - (NSTimeZone *) serverTimeZone;
 
 - (NSArray *) mailAccounts;
-- (NSDictinary *) accountWithName: (NSString *) accountName;
+- (NSDictionary *) accountWithName: (NSString *) accountName;
 - (NSArray *) allIdentities;
 - (NSDictionary *) primaryIdentity;
 - (NSMutableDictionary *) defaultIdentity;

diff --git a/SoObjects/SOGo/SOGoUser.m b/SoObjects/SOGo/SOGoUser.m
index b94e7188f0cbcbc8d7ecf2f714d54693bd008e45..89d6b7f0e0f5a28986851c1c2e242dbc4873e991 100644 (file)
--- a/SoObjects/SOGo/SOGoUser.m
+++ b/SoObjects/SOGo/SOGoUser.m
@@ -507,7 +507,7 @@ NSString *SOGoWeekStartFirstFullWeek = @"FirstFullWeek";
   return mailAccounts;
 }
 
-- (NSDictinary *) accountWithName: (NSString *) accountName
+- (NSDictionary *) accountWithName: (NSString *) accountName;
 {
   NSEnumerator *accounts;
   NSDictionary *mailAccount, *currentAccount;
@@ -518,7 +518,7 @@ NSString *SOGoWeekStartFirstFullWeek = @"FirstFullWeek";
   while (!mailAccount
         && ((currentAccount = [accounts nextObject])))
     if ([[currentAccount objectForKey: @"name"]
-         isEqualToString: nameInContainer])
+         isEqualToString: accountName])
       mailAccount = currentAccount;
 
   return mailAccount;