From 320b693f1559b82e0d04f1bfc1248a96cfee34b0 Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Wed, 14 Mar 2012 22:21:56 +0000 Subject: [PATCH] Fix for ticket #1667. Monotone-Parent: ae81cfe6a503b99f0f90568c09a746363c68ef68 Monotone-Revision: f589a072c04be097399abcfe72a06e62a613c749 Monotone-Author: flachapelle@inverse.ca Monotone-Date: 2012-03-14T22:21:56 --- ChangeLog | 6 ++++++ SoObjects/Mailer/SOGoMailFolder.m | 10 +++------- UI/MailerUI/UIxMailFolderActions.m | 9 +++------ 3 files changed, 12 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index 96431f497..cfa6d0b8a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2012-03-14 Francis Lachapelle + * 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. diff --git a/SoObjects/Mailer/SOGoMailFolder.m b/SoObjects/Mailer/SOGoMailFolder.m index a1c3b5e3d..654f0cd73 100644 --- a/SoObjects/Mailer/SOGoMailFolder.m +++ b/SoObjects/Mailer/SOGoMailFolder.m @@ -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" diff --git a/UI/MailerUI/UIxMailFolderActions.m b/UI/MailerUI/UIxMailFolderActions.m index 2dc1371ba..c0c5dbf7d 100644 --- a/UI/MailerUI/UIxMailFolderActions.m +++ b/UI/MailerUI/UIxMailFolderActions.m @@ -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]; }