From 404574a634b32f741588d74528a07cb2b10017f6 Mon Sep 17 00:00:00 2001 From: Wes Kocher Date: Wed, 29 Jan 2014 21:04:08 -0800 Subject: [PATCH] Backed out changeset 2bfa24370b7c (bug 965461) --- browser/components/preferences/sync.js | 5 +---- services/sync/modules/browserid_identity.js | 1 - 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/browser/components/preferences/sync.js b/browser/components/preferences/sync.js index 53e57fe7bd73..5b80cbbf22f8 100644 --- a/browser/components/preferences/sync.js +++ b/browser/components/preferences/sync.js @@ -127,10 +127,7 @@ let gSyncPane = { fxaLoginStatus.selectedIndex = FXA_LOGIN_UNVERIFIED; enginesListDisabled = true; // So we think we are logged in, so login problems are next. - // (Although if the Sync identity manager is still initializing, we - // ignore login errors and assume all will eventually be good.) - } else if (Weave.Service.identity.readyToAuthenticate && - Weave.Status.login != Weave.LOGIN_SUCCEEDED) { + } else if (Weave.Status.login != Weave.LOGIN_SUCCEEDED) { fxaLoginStatus.selectedIndex = FXA_LOGIN_FAILED; enginesListDisabled = true; // Else we must be golden! diff --git a/services/sync/modules/browserid_identity.js b/services/sync/modules/browserid_identity.js index 133cb5fb242f..d14475825f94 100644 --- a/services/sync/modules/browserid_identity.js +++ b/services/sync/modules/browserid_identity.js @@ -127,7 +127,6 @@ this.BrowserIDManager.prototype = { this._shouldHaveSyncKeyBundle = true; // and we should actually have one... this.whenReadyToAuthenticate.resolve(); this._log.info("Background fetch for key bundle done"); - Weave.Service.verifyLogin(); }).then(null, err => { this._shouldHaveSyncKeyBundle = true; // but we probably don't have one... this.whenReadyToAuthenticate.reject(err);