diff options
3 files changed, 7 insertions, 12 deletions
diff --git a/mailnews/base/prefs/content/accountcreation/emailWizard.js b/mailnews/base/prefs/content/accountcreation/emailWizard.js index 51c2bf1f5a..55ca8f93c2 100644 --- a/mailnews/base/prefs/content/accountcreation/emailWizard.js +++ b/mailnews/base/prefs/content/accountcreation/emailWizard.js @@ -75,7 +75,7 @@ Things to test (works for me): former bug: goes to manual first shortly, then to result **********************/ -// To debug, set mail.wizard.logging.dump (or .console)="All" and kDebug = true +// To debug, set mail.wizard.logging.dump (or .console)="All" function e(elementID) { diff --git a/mailnews/base/prefs/content/accountcreation/fetchhttp.js b/mailnews/base/prefs/content/accountcreation/fetchhttp.js index 04f5272cd9..d2323f7b6f 100644 --- a/mailnews/base/prefs/content/accountcreation/fetchhttp.js +++ b/mailnews/base/prefs/content/accountcreation/fetchhttp.js @@ -159,17 +159,14 @@ FetchHTTP.prototype = else { success = false; - try - { - errorCode = this._request.status; - errorStr = this._request.statusText; - } catch (e) { - // If we can't resolve the hostname in DNS etc., .statusText throws - errorCode = -2; + errorCode = this._request.status; + if (errorCode == 0) { errorStr = getStringBundle( - "chrome://messenger/locale/accountCreationUtil.properties") - .GetStringFromName("cannot_contact_server.error"); + "chrome://messenger/locale/accountCreationUtil.properties") + .GetStringFromName("cannot_contact_server.error"); ddump(errorStr); + } else { + errorStr = this._request.statusText; } } diff --git a/mailnews/base/prefs/content/accountcreation/sanitizeDatatypes.js b/mailnews/base/prefs/content/accountcreation/sanitizeDatatypes.js index 0f95f78d1d..3c927a1af2 100644 --- a/mailnews/base/prefs/content/accountcreation/sanitizeDatatypes.js +++ b/mailnews/base/prefs/content/accountcreation/sanitizeDatatypes.js @@ -198,8 +198,6 @@ function MalformedException(msgID, uncheckedBadValue) var stringBundle = getStringBundle( "chrome://messenger/locale/accountCreationUtil.properties"); var msg = stringBundle.GetStringFromName(msgID); - if (kDebug) - msg += " (bad value: " + new String(uncheckedBadValue) + ")"; Exception.call(this, msg); } MalformedException.prototype = Object.create(Exception.prototype); |