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

Fix for ticket #1667.

Browse Source 
Monotone-Parent: ae81cfe6a503b99f0f90568c09a746363c68ef68
Monotone-Revision: f589a072c04be097399abcfe72a06e62a613c749

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2012-03-14T22:21:56
This commit is contained in:
Francis Lachapelle
2012-03-14 22:21:56 +00:00
parent 54f960ea32
commit 320b693f15
3 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog
+6
View File
@@ -1,5 +1,11 @@
2012-03-14 Francis Lachapelle <flachapelle@inverse.ca>
* UI/MailerUI/UIxMailFolderActions.m (-deleteAction): we now
unconditionaly unsubscribe from the folder and subscribe to the
folder moved to the trash.
* SoObjects/Mailer/SOGoMailFolder.m (-renameTo): idem.
* UI/WebServerResources/UIxPreferences.js (focusCKEditor)
(hideSignature): new functions to wait until the CKEditor is ready
before performing certain actions. Fixes a problem with IE.
SoObjects/Mailer/SOGoMailFolder.m
+3 -7
View File
@@ -298,13 +298,9 @@ static NSString *defaultUserID = @"anyone";
if (!error)
{
// We unsubscribe to the old one, and subscribe back to the new one
if ([[[context activeUser] userDefaults]
mailShowSubscribedFoldersOnly])
{
[client subscribe: [destURL path]];
[client unsubscribe: [imap4URL path]];
}
}
[client subscribe: [destURL path]];
[client unsubscribe: [imap4URL path]];
}
}
else
error = [NSException exceptionWithName: @"SOGoMailException"
UI/MailerUI/UIxMailFolderActions.m
+3 -6
View File
@@ -168,12 +168,9 @@
else
{
// 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]];
}
[[connection client] subscribe: [destURL path]];
[[connection client] unsubscribe: [srcURL path]];
response = [self responseWith204];
}