mirror of
https://github.com/inverse-inc/sogo.git
synced 2026-07-06 08:55:08 +00:00
Monotone-Parent: 92e42146654f909620b7da66ba2c0605408e6a38
Monotone-Revision: 7520c3f3ca840f0f1b0b386fd6a8262877b672ba Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2007-03-30T15:25:20 Monotone-Branch: ca.inverse.sogo
This commit is contained in:
@@ -1,5 +1,9 @@
|
||||
2007-03-30 Wolfgang Sourdeau <wsourdeau@inverse.ca>
|
||||
|
||||
* SoObjects/Mailer/SOGoMailAccount.m ([SOGoMailAccount
|
||||
-toManyRelationshipKeys]): don't put the predefined folders in the
|
||||
list if they are returned by the server.
|
||||
|
||||
* UI/MailerUI/UIxMailTree.m ([UIxMailTree -flattenedNodes]): we no
|
||||
longer store the "flattenedBlocks" in a dictionary since the
|
||||
object will be deleted anyway and we don't need to put the folders
|
||||
|
||||
@@ -100,12 +100,25 @@ static BOOL useAltNamespace = NO;
|
||||
return rootFolderNames;
|
||||
}
|
||||
|
||||
- (NSArray *)toManyRelationshipKeys {
|
||||
NSArray *a, *b;
|
||||
|
||||
a = [self additionalRootFolderNames];
|
||||
b = [[self imap4Connection] subfoldersForURL:[self imap4URL]];
|
||||
return [b count] > 0 ? [b arrayByAddingObjectsFromArray:a] : a;
|
||||
- (NSArray *) toManyRelationshipKeys
|
||||
{
|
||||
NSMutableArray *folders;
|
||||
NSArray *imapFolders, *additionalFolders;
|
||||
|
||||
folders = [NSMutableArray new];
|
||||
[folders autorelease];
|
||||
|
||||
imapFolders = [[self imap4Connection] subfoldersForURL: [self imap4URL]];
|
||||
additionalFolders = [self additionalRootFolderNames];
|
||||
if ([imapFolders count] > 0)
|
||||
[folders addObjectsFromArray: imapFolders];
|
||||
if ([additionalFolders count] > 0)
|
||||
{
|
||||
[folders removeObjectsInArray: additionalFolders];
|
||||
[folders addObjectsFromArray: additionalFolders];
|
||||
}
|
||||
|
||||
return folders;
|
||||
}
|
||||
|
||||
/* identity */
|
||||
|
||||
Reference in New Issue
Block a user