From d4831b43715b249bdaa4acd1e8e5e63e93541323 Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Thu, 22 May 2008 15:58:01 +0000 Subject: [PATCH] Monotone-Parent: 9532f8c1461cc8a7c94898afe1a065fc1c66f2cd Monotone-Revision: 85c10bef83b01a3ff9635d8bbe0d9971df2d6685 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2008-05-22T15:58:01 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 4 ++++ NEWS | 4 ++++ UI/MailerUI/UIxMailFolderActions.m | 4 +++- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index df53d5294..d9fd6e16e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2008-05-22 Wolfgang Sourdeau + * UI/MailerUI/UIxMailFolderActions.m ([UIxMailFolderActions + -renameFolderAction]): select the INBOX folder before renaming the + target folder. + * UI/MainUI/SOGoRootPage.m ([SOGoRootPage -loginSuffix]): new method that returns the login suffix configured in the user defaults. diff --git a/NEWS b/NEWS index 88e8fd542..1e64ec2ff 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,7 @@ +0.9.0-2008XXXX (1.0) +-------------------- +- work around the situation where Courier IMAP would refuse to rename the current mailbox or move it into the trash + 0.9.0-20080520 (1.0 rc6) ------------------------ - retrieving the freebusy DAV object was causing SOGo to crash diff --git a/UI/MailerUI/UIxMailFolderActions.m b/UI/MailerUI/UIxMailFolderActions.m index 86ccd74f5..764e2e62c 100644 --- a/UI/MailerUI/UIxMailFolderActions.m +++ b/UI/MailerUI/UIxMailFolderActions.m @@ -98,7 +98,7 @@ - (WOResponse *) renameFolderAction { - SOGoMailFolder *co; + SOGoMailFolder *co, *inbox; WOResponse *response; NGImap4Connection *connection; NSException *error; @@ -113,6 +113,8 @@ srcURL = [co imap4URL]; destURL = [self _urlOfFolder: srcURL renamedTo: folderName]; connection = [co imap4Connection]; + inbox = [[co mailAccountFolder] inboxFolderInContext: context]; + [[connection client] select: [inbox absoluteImap4Name]]; error = [connection moveMailboxAtURL: srcURL toURL: destURL]; if (error)