amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-03-17 20:45:56 +00:00
Code Issues Projects Releases Wiki Activity

Monotone-Parent: d57d280e1a2c1d6903ab6e6d025a777f3c5e15f2

Browse Source 
Monotone-Revision: 11c950d8b88fc8c605176ab5a6271f54b800c9a5

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2009-03-21T14:43:13
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2009-03-21 14:43:13 +00:00
parent 2e58aba46d
commit 12652ba81f
2 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@@ -1,3 +1,9 @@
2009-03-21 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* SoObjects/SOGo/SOGoUser.m ([SOGoUser
-initWithLogin:newLoginroles:newRoles]): removed "mailAccounts" ivar.
([-mailAccounts]): no longer cache the mailAccounts info in an ivar.
2009-03-20 Ludovic Marcotte <lmarcotte@inverse.ca>
* SoObjects/SOGo/SOGoUserDefaults.{h,m}

23
SoObjects/SOGo/SOGoUser.m
View File

@@ -264,7 +264,6 @@ _timeValue (NSString *key)
allEmails = nil;
currentPassword = nil;
cn = nil;
mailAccounts = nil;
}
}
else
@@ -281,7 +280,6 @@ _timeValue (NSString *key)
[allEmails release];
[currentPassword release];
[cn release];
[mailAccounts release];
[super dealloc];
}
@@ -692,10 +690,10 @@ _timeValue (NSString *key)
}
/* mail */
- (void) _prepareDefaultMailAccounts
- (NSArray *) _prepareDefaultMailAccounts
{
NSMutableDictionary *mailAccount, *identity;
NSMutableArray *identities;
NSMutableArray *identities, *mailAccounts;
NSString *name, *fullName, *imapLogin;
NSArray *mails;
unsigned int count, max;
@@ -731,21 +729,19 @@ _timeValue (NSString *key)
mailAccounts = [NSMutableArray new];
[mailAccounts addObject: mailAccount];
return mailAccounts;
}
- (NSArray *) mailAccounts
{
NSUserDefaults *ud;
NSArray *mailAccounts;
ud = [self userDefaults];
mailAccounts = [ud objectForKey: @"MailAccounts"];
if (!mailAccounts)
{
ud = [self userDefaults];
mailAccounts = [ud objectForKey: @"MailAccounts"];
if (mailAccounts)
[mailAccounts retain];
else
[self _prepareDefaultMailAccounts];
}
mailAccounts = [self _prepareDefaultMailAccounts];
return mailAccounts;
}
@@ -835,8 +831,7 @@ _timeValue (NSString *key)
{
NSDictionary *defaultAccount;
[self mailAccounts];
defaultAccount = [mailAccounts objectAtIndex: 0];
defaultAccount = [[self mailAccounts] objectAtIndex: 0];
return [[defaultAccount objectForKey: @"identities"] objectAtIndex: 0];
}