amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-03-22 06:42:44 +00:00
Code Issues Projects Releases Wiki Activity

Fixed bug #1944

Browse Source 
Deleting a mail folder doesn't create the Trash mailbox.
This commit is contained in:
Luc Charland
2012-09-25 10:29:24 -04:00
parent 129880f8c5
commit dfe369dd20
3 changed files with 54 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
UI/MailerUI/UIxMailFolderActions.m
View File

@@ -153,26 +153,34 @@
NSURL *srcURL, *destURL;
co = [self clientObject];
connection = [co imap4Connection];
srcURL = [co imap4URL];
destURL = [self _trashedURLOfFolder: srcURL withCO: co];
connection = [co imap4Connection];
inbox = [[co mailAccountFolder] inboxFolderInContext: context];
[[connection client] select: [inbox absoluteImap4Name]];
error = [connection moveMailboxAtURL: srcURL toURL: destURL];
if (error)
{
response = [self responseWithStatus: 500];
[response appendContentString: @"Unable to move folder."];
}
if ([co ensureTrashFolder])
{
connection = [co imap4Connection];
srcURL = [co imap4URL];
destURL = [self _trashedURLOfFolder: srcURL withCO: co];
connection = [co imap4Connection];
inbox = [[co mailAccountFolder] inboxFolderInContext: context];
[[connection client] select: [inbox absoluteImap4Name]];
error = [connection moveMailboxAtURL: srcURL toURL: destURL];
if (error)
{
response = [self responseWithStatus: 500];
[response appendContentString: @"Unable to move folder."];
}
else
{
// We unsubscribe to the old one, and subscribe back to the new one
[[connection client] subscribe: [destURL path]];
[[connection client] unsubscribe: [srcURL path]];
response = [self responseWith204];
}
}
else
{
// We unsubscribe to the old one, and subscribe back to the new one
[[connection client] subscribe: [destURL path]];
[[connection client] unsubscribe: [srcURL path]];
response = [self responseWith204];
}
{
response = [self responseWithStatus: 500];
[response appendContentString: @"Unable to move folder."];
}
return response;
}