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

Monotone-Parent: 5d6bd031d4a71e69a4759798355764f7f9894322 

Monotone-Revision: 4b75d0f2673a649962c631fea2213e8dbf33a7b1

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2010-08-19T19:22:08
Monotone-Branch: ca.inverse.sogo
maint-2.0.2
Wolfgang Sourdeau 2010-08-19 19:22:08 +00:00
parent bbe850c044
commit 67720a01a0
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,5 +1,9 @@
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
method.
(onMessageListPrepareVisibility): fixed a bug where the current

20
SoObjects/Mailer/SOGoMailFolder.m
View File

@ -271,7 +271,7 @@ static NSString *defaultUserID = @"anyone";
NGImap4Client *client;
NSString *folderName;
NSException *error;
id result;
NSString *result;
BOOL b;
trashFolder = [[self mailAccountFolder] trashFolderInContext: localContext];
@ -296,19 +296,21 @@ static NSString *defaultUserID = @"anyone";
objectForKey: @"result"];
if (![result boolValue])
result = [[self imap4Connection] createMailbox: folderName atURL: [[self mailAccountFolder] imap4URL]];
[[self imap4Connection] createMailbox: folderName
atURL: [[self mailAccountFolder] imap4URL]];
result = [[client copyUids: uids toFolder: folderName]
objectForKey: @"result"];
if (!result || [result boolValue])
result = [client copyUids: uids toFolder: folderName];
b = [[result valueForKey: @"result"] boolValue];
b = [result boolValue];
}
if (b)
{
result = [client storeFlags: [NSArray arrayWithObject: @"Deleted"]
forUIDs: uids addOrRemove: YES];
if ([[result valueForKey: @"result"] boolValue])
result = [[client storeFlags: [NSArray arrayWithObject: @"Deleted"]
forUIDs: uids addOrRemove: YES]
objectForKey: @"result"];
if ([result boolValue])
{
[self markForExpunge];
[trashFolder flushMailCaches];