LupusNobilis/sogo
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Monotone-Parent: 5c6fab45e109e2532a1c9b92550cc558a098ca15

Browse source 
Monotone-Revision: e413755917120b912a952ed708f5bc3d48d1f8c7

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2007-07-10T18:17:16
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau 2007-07-10 18:17:16 +00:00
parent ee5ce740d5
commit 2a173f4c1f
1 changed files with 20 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
SoObjects/Mailer/SOGoMailAccount.m
View file

@ -202,18 +202,19 @@ static BOOL useAltNamespace = NO;
return s;
}
- (NSURL *)imap4URL {
- (NSURL *) imap4URL
{
/* imap://agenortest@mail.opengroupware.org/ */
NSString *s;
if (self->imap4URL != nil)
return self->imap4URL;
if ((s = [self imap4URLString]) == nil)
return nil;
self->imap4URL = [[NSURL alloc] initWithString:s];
return self->imap4URL;
if (!imap4URL)
{
s = [self imap4URLString];
if (s)
imap4URL = [[NSURL alloc] initWithString: s];
}
return imap4URL;
}
- (NSString *)imap4Login {
@ -323,22 +324,22 @@ static BOOL useAltNamespace = NO;
// TODO: use some profile to determine real location, use a -traverse lookup
SOGoMailFolder *folder;
if (self->inboxFolder != nil)
return self->inboxFolder;
if (inboxFolder != nil)
return inboxFolder;
folder = [self lookupName:[self inboxFolderNameInContext:_ctx]
inContext:_ctx acquire:NO];
if ([folder isKindOfClass:[NSException class]]) return folder;
return ((self->inboxFolder = [folder retain]));
return ((inboxFolder = [folder retain]));
}
- (SOGoMailFolder *)sentFolderInContext:(id)_ctx {
// TODO: use some profile to determine real location, use a -traverse lookup
SOGoMailFolder *folder;
if (self->sentFolder != nil)
return self->sentFolder;
if (sentFolder != nil)
return sentFolder;
folder = useAltNamespace ? (id)self : [self inboxFolderInContext:_ctx];
if ([folder isKindOfClass:[NSException class]]) return folder;
@ -352,15 +353,15 @@ static BOOL useAltNamespace = NO;
reason:@"did not find Sent folder!"];
}
return ((self->sentFolder = [folder retain]));
return ((sentFolder = [folder retain]));
}
- (SOGoMailFolder *)trashFolderInContext:(id)_ctx {
// TODO: use some profile to determine real location
SOGoMailFolder *folder;
if (self->trashFolder != nil)
return self->trashFolder;
if (trashFolder != nil)
return trashFolder;
folder = useAltNamespace ? (id)self : [self inboxFolderInContext:_ctx];
if ([folder isKindOfClass:[NSException class]]) return folder;
@ -374,7 +375,7 @@ static BOOL useAltNamespace = NO;
reason:@"did not find Trash folder!"];
}
return ((self->trashFolder = [folder retain]));
return ((trashFolder = [folder retain]));
}
/* WebDAV */