Fix for ticket #1667.
Monotone-Parent: ae81cfe6a503b99f0f90568c09a746363c68ef68 Monotone-Revision: f589a072c04be097399abcfe72a06e62a613c749 Monotone-Author: flachapelle@inverse.ca Monotone-Date: 2012-03-14T22:21:56
This commit is contained in:
parent
54f960ea32
commit
320b693f15
|
@ -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.
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -168,11 +168,8 @@
|
|||
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];
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue