Monotone-Parent: 7a345b6ebd36ad4ef1f0c2c30d559df53723f3b8
Monotone-Revision: 5c6fab45e109e2532a1c9b92550cc558a098ca15 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2007-07-10T15:21:34 Monotone-Branch: ca.inverse.sogo
This commit is contained in:
parent
a8d41aeed9
commit
ee5ce740d5
|
@ -46,19 +46,10 @@ static NSString *defaultUserID = @"anyone";
|
|||
|
||||
static BOOL useAltNamespace = NO;
|
||||
|
||||
+ (int) version
|
||||
{
|
||||
return [super version] + 0 /* v1 */;
|
||||
}
|
||||
|
||||
+ (void) initialize
|
||||
{
|
||||
NSUserDefaults *ud = [NSUserDefaults standardUserDefaults];
|
||||
|
||||
NSAssert2([super version] == 1,
|
||||
@"invalid superclass (%@) version %i !",
|
||||
NSStringFromClass([self superclass]), [super version]);
|
||||
|
||||
useAltNamespace = [ud boolForKey:@"SOGoSpecialFoldersInRoot"];
|
||||
}
|
||||
|
||||
|
@ -111,7 +102,7 @@ static BOOL useAltNamespace = NO;
|
|||
|
||||
- (NSString *) relativeImap4Name
|
||||
{
|
||||
return [self nameInContainer];
|
||||
return nameInContainer;
|
||||
}
|
||||
|
||||
/* listing the available folders */
|
||||
|
@ -398,8 +389,8 @@ static BOOL useAltNamespace = NO;
|
|||
return folderType;
|
||||
|
||||
account = [self mailAccountFolder];
|
||||
n = [self nameInContainer];
|
||||
|
||||
n = nameInContainer;
|
||||
|
||||
if ([n isEqualToString:[account trashFolderNameInContext:nil]])
|
||||
folderType = @"IPF.Trash";
|
||||
else if ([n isEqualToString:[account inboxFolderNameInContext:nil]])
|
||||
|
|
Loading…
Reference in a new issue