From e4f8477929eb175bd452702e6454d7cceaae846a Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Fri, 6 Aug 2010 21:04:15 +0000 Subject: [PATCH] Monotone-Parent: b9881036cb14d433a260903357497efadfdfbec6 Monotone-Revision: 1e6106de581b46f2a2162a87a140cab55f9d3500 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2010-08-06T21:04:15 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 3 +++ UI/WebServerResources/generic.js | 27 --------------------------- 2 files changed, 3 insertions(+), 27 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7753ade77..d215723ab 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2010-08-06 Wolfgang Sourdeau + * UI/WebServerResources/generic.js (reloadPreferences): dropped + useless method. + * UI/PreferencesUI/UIxPreferences.m (_extractAuxiliaryAccounts:): since we no longer transfer the user password to the client, the old password has to be fetched from the old account unless a new diff --git a/UI/WebServerResources/generic.js b/UI/WebServerResources/generic.js index 59ee29e3e..43a20e612 100644 --- a/UI/WebServerResources/generic.js +++ b/UI/WebServerResources/generic.js @@ -1437,33 +1437,6 @@ function indexColor(number) { return color; } -function reloadPreferences() { - var url = UserFolderURL + "jsonDefaults"; - var http = createHTTPClient(); - http.open("GET", url, false); - http.send(""); - - if (http.status == 200) { - if (http.responseText.length > 0) { - UserDefaults = http.responseText.evalJSON(true); - if (!UserDefaults) - UserDefaults = {}; - } - else - UserDefaults = {}; - } - - url = UserFolderURL + "jsonSettings"; - http.open("GET", url, false); - http.send(""); - if (http.status == 200) { - if (http.responseText.length > 0) - UserSettings = http.responseText.evalJSON(true); - else - UserSettings = {}; - } -} - function onLoadHandler(event) { queryParameters = parseQueryParameters('' + window.location); if (!$(document.body).hasClassName("popup")) {