From 8814d74859eca5ab454f1e7936d4843a58b33556 Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Wed, 30 Mar 2011 19:15:51 +0000 Subject: [PATCH] Monotone-Parent: cac720ccc4cdf4de23aa3a87fa473d110909ddbc Monotone-Revision: cad4edcdc9e152de6c74020fb70a7a2750f5c5e6 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2011-03-30T19:15:51 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 5 +++++ UI/MailerUI/UIxMailFolderActions.m | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7048ec139..d5e1c4576 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2011-03-30 Wolfgang Sourdeau + * UI/MailerUI/UIxMailFolderActions.m (-copyMessagesAction) + (-expungeAction, -emptyTrashAction): use "-mailAccountFolder" in + order to retrieve the account folder as the clientObject may + actually be a nested folder... + * UI/WebServerResources/UIxTaskEditor.js (initializeStatusLine): bind onStatusListChange as callback to "change" rather than "mouseup" as it otherwise fails to be invoked on Chrome. diff --git a/UI/MailerUI/UIxMailFolderActions.m b/UI/MailerUI/UIxMailFolderActions.m index 234623ebd..3858d98e3 100644 --- a/UI/MailerUI/UIxMailFolderActions.m +++ b/UI/MailerUI/UIxMailFolderActions.m @@ -314,7 +314,7 @@ if (!response) { // We return the inbox quota - account = [co container]; + account = [co mailAccountFolder]; data = [NSDictionary dictionaryWithObjectsAndKeys: [account getInboxQuota], @"quotas", nil]; response = [self responseWithStatus: 200 andString: [data jsonRepresentation]]; @@ -492,7 +492,7 @@ [co flushMailCaches]; // We return the inbox quota - account = [co container]; + account = [co mailAccountFolder]; data = [NSDictionary dictionaryWithObjectsAndKeys: [account getInboxQuota], @"quotas", nil]; response = [self responseWithStatus: 200 andString: [data jsonRepresentation]]; @@ -533,7 +533,7 @@ else { // We return the inbox quota - account = [co container]; + account = [co mailAccountFolder]; data = [NSDictionary dictionaryWithObjectsAndKeys: [account getInboxQuota], @"quotas", nil]; response = [self responseWithStatus: 200 andString: [data jsonRepresentation]];