amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-03-24 23:52:43 +00:00
Code Issues Projects Releases Wiki Activity

merge of '11bccd9e32f64627c80021f1ebe5a4a27341208f'

Browse Source 
and 'd76a6bc23d031a16535ce20a79d7881c485b3025'

Monotone-Parent: 11bccd9e32f64627c80021f1ebe5a4a27341208f
Monotone-Parent: d76a6bc23d031a16535ce20a79d7881c485b3025
Monotone-Revision: bbd203abc78f2fcaff9b64e547342ba96b97bfb3

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2009-10-01T12:41:57
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2009-10-01 12:41:57 +00:00
parent b3d3c61713 57c5a4eb5d
commit 2e93d8d329
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Main/SOGo.m
View File

@@ -97,10 +97,10 @@ static BOOL debugObjectAllocation = NO;
#endif
debugRequests = [ud boolForKey: @"SOGoDebugRequests"];
debugLeaks = [ud boolForKey: @"SOGoDebugLeaks"];
/* vMem size check - default is 200MB */
/* vMem size check - default is 384MB */
tmp = [ud objectForKey: @"SxVMemLimit"];
vMemSizeLimit = ((tmp != nil) ? [tmp intValue] : 200);
vMemSizeLimit = ((tmp != nil) ? [tmp intValue] : 384);
if (vMemSizeLimit > 0)
NSLog(@"Note: vmem size check enabled: shutting down app when "
@"vmem > %d MB", vMemSizeLimit);

4
UI/WebServerResources/MailerUI.js
View File

@@ -1876,7 +1876,9 @@ function onLoadMailboxesCallback(http) {
}
function buildMailboxes(accountKeys, encoded) {
var account = new Mailbox("account", accountKeys[0], null, accountKeys[1]);
var account = new Mailbox("account", accountKeys[0],
undefined, //necessary, null will cause issues
accountKeys[1]);
var data = encoded.evalJSON(true);
var mailboxes = data.mailboxes;
var unseen = (data.status? data.status.unseen : 0);