merge of '193627476b7f3a685b8b6cfd32f56231e28a5b94'

and '49b01807f1c5d14232f8021564406a02f9736a62'

Monotone-Parent: 193627476b7f3a685b8b6cfd32f56231e28a5b94
Monotone-Parent: 49b01807f1c5d14232f8021564406a02f9736a62
Monotone-Revision: 9634e883abb4f5cf42e1b4d9c3d3e1b1a61f3e7f

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2010-11-29T20:02:35
Monotone-Branch: ca.inverse.sogo
maint-2.0.2
Wolfgang Sourdeau 2010-11-29 20:02:35 +00:00
commit d1fa84ff94
2 changed files with 4 additions and 4 deletions

View File

@ -50,7 +50,7 @@ var MailerUIdTreeExtension = {
expandedFolders.push(this.aNodes[n].dataname);
}
}
return expandedFolders.toJSON();
return Object.toJSON(expandedFolders);
},
autoSync: function() {
this.config.useCookies = true;

View File

@ -45,7 +45,7 @@ function savePreferences(sender) {
if (isSieveScriptsEnabled) {
var jsonFilters = prototypeIfyFilters();
$("sieveFilters").setValue(jsonFilters.toJSON());
$("sieveFilters").setValue(Object.toJSON(jsonFilters));
}
saveMailAccounts();
@ -753,7 +753,7 @@ function saveMailAccounts() {
compactMailAccounts();
var mailAccountsJSON = $("mailAccountsJSON");
mailAccountsJSON.value = mailAccounts.toJSON();
mailAccountsJSON.value = Object.toJSON(mailAccounts);
}
function compactMailAccounts() {
@ -930,7 +930,7 @@ function serializeContactsCategories() {
values.push(td.allTextContent());
}
$("contactsCategoriesValue").value = values.toJSON();
$("contactsCategoriesValue").value = Object.toJSON(values);
}
/* / contact categories */