mirror of
https://github.com/inverse-inc/sogo.git
synced 2026-10-21 18:48:12 +00:00
See ChangeLog for full details.
Monotone-Parent: 4ebf80607b2a71f3b2192bd3ba8c310f15bd37f5 Monotone-Revision: 8b8f40b39b92d25a5eb1161d5efe0bd91fd3e207 Monotone-Author: ludovic@Sophos.ca Monotone-Date: 2007-10-10T18:44:26 Monotone-Branch: ca.inverse.sogo
This commit is contained in:
1 parent
dc48bb9e4c
commit
778658c75a
11 files changed
+272
-35
No files matched your search
+19
-10
@@ -365,22 +365,31 @@ NSString *SOGoWeekStartFirstFullWeek = @"FirstFullWeek";
|
||||
|
||||
if (!mailAccounts)
|
||||
{
|
||||
NSArray *mails;
|
||||
int i;
|
||||
|
||||
mailAccount = [NSMutableDictionary dictionary];
|
||||
name = [NSString stringWithFormat: @"%@@%@", login, fallbackIMAP4Server];
|
||||
[mailAccount setObject: login forKey: @"userName"];
|
||||
[mailAccount setObject: fallbackIMAP4Server forKey: @"serverName"];
|
||||
[mailAccount setObject: name forKey: @"name"];
|
||||
|
||||
identity = [NSMutableDictionary dictionary];
|
||||
fullName = [self cn];
|
||||
if (![fullName length])
|
||||
fullName = login;
|
||||
[identity setObject: fullName forKey: @"fullName"];
|
||||
[identity setObject: [self systemEmail] forKey: @"email"];
|
||||
[identity setObject: [NSNumber numberWithBool: YES] forKey: @"isDefault"];
|
||||
|
||||
identities = [NSMutableArray array];
|
||||
[identities addObject: identity];
|
||||
mails = [self allEmails];
|
||||
|
||||
for (i = 0; i < [mails count]; i++)
|
||||
{
|
||||
identity = [NSMutableDictionary dictionary];
|
||||
fullName = [self cn];
|
||||
if (![fullName length])
|
||||
fullName = login;
|
||||
[identity setObject: fullName forKey: @"fullName"];
|
||||
[identity setObject: [mails objectAtIndex: i] forKey: @"email"];
|
||||
|
||||
if (i == 0) [identity setObject: [NSNumber numberWithBool: YES] forKey: @"isDefault"];
|
||||
[identities addObject: identity];
|
||||
}
|
||||
|
||||
[mailAccount setObject: identities forKey: @"identities"];
|
||||
|
||||
mailAccounts = [NSMutableArray new];
|
||||
@@ -499,7 +508,7 @@ NSString *SOGoWeekStartFirstFullWeek = @"FirstFullWeek";
|
||||
|
||||
[(WOContext *)_ctx setObject: ((folder)
|
||||
? folder
|
||||
: [NSNull null])
|
||||
: (id)[NSNull null])
|
||||
forKey: @"ActiveUserHomeFolder"];
|
||||
return folder;
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user