Monotone-Parent: 3ee72d61be422ae0de673c44599a3d6c279962a8
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:
parent
329eef42ee
commit
fd0475847e
|
@ -231,7 +231,7 @@ static BOOL debugSoParts = NO;
|
||||||
id msgs;
|
id msgs;
|
||||||
|
|
||||||
if (!coreInfos)
|
if (!coreInfos)
|
||||||
{
|
{
|
||||||
msgs = [self fetchParts: coreInfoKeys]; // returns dict
|
msgs = [self fetchParts: coreInfoKeys]; // returns dict
|
||||||
if (heavyDebug)
|
if (heavyDebug)
|
||||||
[self logWithFormat: @"M: %@", msgs];
|
[self logWithFormat: @"M: %@", msgs];
|
||||||
|
@ -990,7 +990,7 @@ static BOOL debugSoParts = NO;
|
||||||
|
|
||||||
// TODO: check for safe HTTP method
|
// TODO: check for safe HTTP method
|
||||||
|
|
||||||
trashFolder = [[self mailAccountFolder] trashFolderInContext:_ctx];
|
trashFolder = [[self mailAccountFolder] trashFolderInContext: _ctx];
|
||||||
if ([trashFolder isKindOfClass:[NSException class]])
|
if ([trashFolder isKindOfClass:[NSException class]])
|
||||||
return (NSException *)trashFolder;
|
return (NSException *)trashFolder;
|
||||||
if (![trashFolder isNotNull]) {
|
if (![trashFolder isNotNull]) {
|
||||||
|
@ -1004,17 +1004,17 @@ static BOOL debugSoParts = NO;
|
||||||
error = [self davCopyToTargetObject:trashFolder
|
error = [self davCopyToTargetObject:trashFolder
|
||||||
newName: @"fakeNewUnusedByIMAP4" /* autoassigned */
|
newName: @"fakeNewUnusedByIMAP4" /* autoassigned */
|
||||||
inContext:_ctx];
|
inContext:_ctx];
|
||||||
if (error != nil) return error;
|
if (error) return error;
|
||||||
|
|
||||||
/* b) mark deleted */
|
/* b) mark deleted */
|
||||||
|
|
||||||
error = [[self imap4Connection] markURLDeleted: [self imap4URL]];
|
error = [[self imap4Connection] markURLDeleted: [self imap4URL]];
|
||||||
if (error != nil) return error;
|
if (error) return error;
|
||||||
|
|
||||||
[container markForExpunge];
|
[container markForExpunge];
|
||||||
|
|
||||||
[self flushMailCaches];
|
[self flushMailCaches];
|
||||||
|
|
||||||
return nil;
|
return nil;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -549,15 +549,9 @@ static int sizeLimit;
|
||||||
entries = nil;
|
entries = nil;
|
||||||
|
|
||||||
if (entries)
|
if (entries)
|
||||||
{
|
while ((currentEntry = [entries nextObject]))
|
||||||
currentEntry = [entries nextObject];
|
[contacts addObject:
|
||||||
while (currentEntry)
|
[self _convertLDAPEntryToContact: currentEntry]];
|
||||||
{
|
|
||||||
[contacts addObject:
|
|
||||||
[self _convertLDAPEntryToContact: currentEntry]];
|
|
||||||
currentEntry = [entries nextObject];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
[ldapConnection release];
|
[ldapConnection release];
|
||||||
}
|
}
|
||||||
|
|
|
@ -132,7 +132,7 @@
|
||||||
[response appendContentString: @"Missing 'name' parameter."];
|
[response appendContentString: @"Missing 'name' parameter."];
|
||||||
}
|
}
|
||||||
|
|
||||||
return response;
|
return response;
|
||||||
}
|
}
|
||||||
|
|
||||||
- (NSURL *) _trashedURLOfFolder: (NSURL *) srcURL
|
- (NSURL *) _trashedURLOfFolder: (NSURL *) srcURL
|
||||||
|
|
Loading…
Reference in a new issue