Monotone-Parent: cac720ccc4cdf4de23aa3a87fa473d110909ddbc

Monotone-Revision: cad4edcdc9e152de6c74020fb70a7a2750f5c5e6

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2011-03-30T19:15:51
Monotone-Branch: ca.inverse.sogo
maint-2.0.2
Wolfgang Sourdeau 2011-03-30 19:15:51 +00:00
parent 8953809290
commit 8814d74859
2 changed files with 8 additions and 3 deletions

View File

@ -1,5 +1,10 @@
2011-03-30 Wolfgang Sourdeau <wsourdeau@inverse.ca> 2011-03-30 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* 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): * UI/WebServerResources/UIxTaskEditor.js (initializeStatusLine):
bind onStatusListChange as callback to "change" rather than bind onStatusListChange as callback to "change" rather than
"mouseup" as it otherwise fails to be invoked on Chrome. "mouseup" as it otherwise fails to be invoked on Chrome.

View File

@ -314,7 +314,7 @@
if (!response) if (!response)
{ {
// We return the inbox quota // We return the inbox quota
account = [co container]; account = [co mailAccountFolder];
data = [NSDictionary dictionaryWithObjectsAndKeys: [account getInboxQuota], @"quotas", nil]; data = [NSDictionary dictionaryWithObjectsAndKeys: [account getInboxQuota], @"quotas", nil];
response = [self responseWithStatus: 200 response = [self responseWithStatus: 200
andString: [data jsonRepresentation]]; andString: [data jsonRepresentation]];
@ -492,7 +492,7 @@
[co flushMailCaches]; [co flushMailCaches];
// We return the inbox quota // We return the inbox quota
account = [co container]; account = [co mailAccountFolder];
data = [NSDictionary dictionaryWithObjectsAndKeys: [account getInboxQuota], @"quotas", nil]; data = [NSDictionary dictionaryWithObjectsAndKeys: [account getInboxQuota], @"quotas", nil];
response = [self responseWithStatus: 200 response = [self responseWithStatus: 200
andString: [data jsonRepresentation]]; andString: [data jsonRepresentation]];
@ -533,7 +533,7 @@
else else
{ {
// We return the inbox quota // We return the inbox quota
account = [co container]; account = [co mailAccountFolder];
data = [NSDictionary dictionaryWithObjectsAndKeys: [account getInboxQuota], @"quotas", nil]; data = [NSDictionary dictionaryWithObjectsAndKeys: [account getInboxQuota], @"quotas", nil];
response = [self responseWithStatus: 200 response = [self responseWithStatus: 200
andString: [data jsonRepresentation]]; andString: [data jsonRepresentation]];