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

Monotone-Parent: 3ee72d61be422ae0de673c44599a3d6c279962a8

Browse source 
Monotone-Revision: 6d14fa17601563041dc59c292979e3fd45726a47

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2008-09-19T14:03:56
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau 2008-09-19 14:03:56 +00:00
parent 329eef42ee
commit fd0475847e
3 changed files with 9 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
SoObjects/Mailer/SOGoMailObject.m
View file

@ -990,7 +990,7 @@ static BOOL debugSoParts = NO;
// TODO: check for safe HTTP method
trashFolder = [[self mailAccountFolder] trashFolderInContext:_ctx];
trashFolder = [[self mailAccountFolder] trashFolderInContext: _ctx];
if ([trashFolder isKindOfClass:[NSException class]])
return (NSException *)trashFolder;
if (![trashFolder isNotNull]) {
@ -1004,12 +1004,12 @@ static BOOL debugSoParts = NO;
error = [self davCopyToTargetObject:trashFolder
newName: @"fakeNewUnusedByIMAP4" /* autoassigned */
inContext:_ctx];
if (error != nil) return error;
if (error) return error;
/* b) mark deleted */
error = [[self imap4Connection] markURLDeleted: [self imap4URL]];
if (error != nil) return error;
if (error) return error;
[container markForExpunge];

12
SoObjects/SOGo/LDAPSource.m
View file

@ -549,15 +549,9 @@ static int sizeLimit;
entries = nil;
if (entries)
{
currentEntry = [entries nextObject];
while (currentEntry)
{
[contacts addObject:
[self _convertLDAPEntryToContact: currentEntry]];
currentEntry = [entries nextObject];
}
}
while ((currentEntry = [entries nextObject]))
[contacts addObject:
[self _convertLDAPEntryToContact: currentEntry]];
[ldapConnection release];
}