Monotone-Parent: 5d6bd031d4a71e69a4759798355764f7f9894322
Monotone-Revision: 4b75d0f2673a649962c631fea2213e8dbf33a7b1 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2010-08-19T19:22:08 Monotone-Branch: ca.inverse.sogo
This commit is contained in:
parent
bbe850c044
commit
67720a01a0
|
@ -1,5 +1,9 @@
|
||||||
2010-08-19 Wolfgang Sourdeau <wsourdeau@inverse.ca>
|
2010-08-19 Wolfgang Sourdeau <wsourdeau@inverse.ca>
|
||||||
|
|
||||||
|
* SoObjects/Mailer/SOGoMailFolder.m (-deleteUIDs:inContext:): make
|
||||||
|
the use of the "result" variable clearer by declaring it with a
|
||||||
|
proper class name and avoiding type confusion within the code.
|
||||||
|
|
||||||
* UI/WebServerResources/MailerUI.js: (initDnd): removed useless
|
* UI/WebServerResources/MailerUI.js: (initDnd): removed useless
|
||||||
method.
|
method.
|
||||||
(onMessageListPrepareVisibility): fixed a bug where the current
|
(onMessageListPrepareVisibility): fixed a bug where the current
|
||||||
|
|
|
@ -271,7 +271,7 @@ static NSString *defaultUserID = @"anyone";
|
||||||
NGImap4Client *client;
|
NGImap4Client *client;
|
||||||
NSString *folderName;
|
NSString *folderName;
|
||||||
NSException *error;
|
NSException *error;
|
||||||
id result;
|
NSString *result;
|
||||||
BOOL b;
|
BOOL b;
|
||||||
|
|
||||||
trashFolder = [[self mailAccountFolder] trashFolderInContext: localContext];
|
trashFolder = [[self mailAccountFolder] trashFolderInContext: localContext];
|
||||||
|
@ -296,19 +296,21 @@ static NSString *defaultUserID = @"anyone";
|
||||||
objectForKey: @"result"];
|
objectForKey: @"result"];
|
||||||
|
|
||||||
if (![result boolValue])
|
if (![result boolValue])
|
||||||
result = [[self imap4Connection] createMailbox: folderName atURL: [[self mailAccountFolder] imap4URL]];
|
[[self imap4Connection] createMailbox: folderName
|
||||||
|
atURL: [[self mailAccountFolder] imap4URL]];
|
||||||
|
|
||||||
if (!result || [result boolValue])
|
result = [[client copyUids: uids toFolder: folderName]
|
||||||
result = [client copyUids: uids toFolder: folderName];
|
objectForKey: @"result"];
|
||||||
|
|
||||||
b = [[result valueForKey: @"result"] boolValue];
|
b = [result boolValue];
|
||||||
}
|
}
|
||||||
|
|
||||||
if (b)
|
if (b)
|
||||||
{
|
{
|
||||||
result = [client storeFlags: [NSArray arrayWithObject: @"Deleted"]
|
result = [[client storeFlags: [NSArray arrayWithObject: @"Deleted"]
|
||||||
forUIDs: uids addOrRemove: YES];
|
forUIDs: uids addOrRemove: YES]
|
||||||
if ([[result valueForKey: @"result"] boolValue])
|
objectForKey: @"result"];
|
||||||
|
if ([result boolValue])
|
||||||
{
|
{
|
||||||
[self markForExpunge];
|
[self markForExpunge];
|
||||||
[trashFolder flushMailCaches];
|
[trashFolder flushMailCaches];
|
||||||
|
|
Loading…
Reference in a new issue