amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-05-25 13:25:28 +00:00
Code Issues Projects Releases Wiki Activity

merge of '33a155bb9aa78b5b1566316b90bfe31c482dc6a2'

Browse Source 
and 'dad4b61f6a15f4d008df898e890a7b7f753c94e9'

Monotone-Parent: 33a155bb9aa78b5b1566316b90bfe31c482dc6a2
Monotone-Parent: dad4b61f6a15f4d008df898e890a7b7f753c94e9
Monotone-Revision: 96b7d5f5bff55eab43747cf0e5e2b7e3d5df7d82

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2010-02-18T21:40:29
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2010-02-18 21:40:29 +00:00
parent 4584652626 d5af9f3d86
commit 4209def9c3
2 changed files with 32 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog
+8
View File
@@ -1,3 +1,11 @@
2010-02-18 Ludovic Marcotte <lmarcotte@inverse.ca>
* UI/MailerUI/UIxMailFolderActions.m: Modified the
code so that we correctly subscribe/unsubscribe to
the folders (old/new) when renaming or deleting
a folder. Also corrected the creation of subfolders
by using -absoluteImap4Name.
2010-02-18 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* UI/MainUI/SOGoRootPage.m (-_casDefaultAction): when the local
UI/MailerUI/UIxMailFolderActions.m
+24 -4
View File
@@ -69,8 +69,9 @@
else
{
path = [NSString stringWithFormat: @"%@%@",
[[co imap4URL] path], folderName];
[[connection client] subscribe: path];
[co absoluteImap4Name], folderName];
[[connection client] subscribe: path];
response = [self responseWith204];
}
}
@@ -123,13 +124,23 @@
[[connection client] select: [inbox absoluteImap4Name]];
error = [connection moveMailboxAtURL: srcURL
toURL: destURL];
if (error)
{
response = [self responseWithStatus: 500];
[response appendContentString: @"Unable to rename folder."];
}
else
response = [self responseWith204];
{
// We unsubscribe to the old one, and subscribe back to the new one
if ([[[context activeUser] userDefaults] mailShowSubscribedFoldersOnly])
{
[[connection client] subscribe: [destURL path]];
[[connection client] unsubscribe: [srcURL path]];
}
response = [self responseWith204];
}
}
else
{
@@ -200,7 +211,16 @@
[response appendContentString: @"Unable to move folder."];
}
else
response = [self responseWith204];
{
// We unsubscribe to the old one, and subscribe back to the new one
if ([[[context activeUser] userDefaults] mailShowSubscribedFoldersOnly])
{
[[connection client] subscribe: [destURL path]];
[[connection client] unsubscribe: [srcURL path]];
}
response = [self responseWith204];
}
return response;
}