author | Richard Newman <rnewman@mozilla.com> |
Thu, 13 Mar 2014 16:37:26 -0700 | |
changeset 173535 | 8b53fb541235f1d741dd7f9ec46a07302ab18e22 |
parent 173534 | 1767b08fd43a2ddbf4ad0ca95cc7d7f4741225d8 |
child 173536 | 7d63f2bf9042804952f88f16f7f8c1bb966fde66 |
push id | 26408 |
push user | cbook@mozilla.com |
push date | Fri, 14 Mar 2014 11:35:49 +0000 |
treeherder | mozilla-central@d527230a2032 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | markh |
bugs | 978876 |
milestone | 30.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
--- a/services/sync/modules/browserid_identity.js +++ b/services/sync/modules/browserid_identity.js @@ -204,16 +204,19 @@ this.BrowserIDManager.prototype = { this._log.info("Waiting for user to be verified."); this._fxaService.whenVerified(accountData).then(accountData => { this._updateSignedInUser(accountData); this._log.info("Starting fetch for key bundle."); if (this.needsCustomization) { let data = this.offerSyncOptions(); if (data.accepted) { Services.prefs.clearUserPref(PREF_SYNC_SHOW_CUSTOMIZATION); + + // Mark any non-selected engines as declined. + Weave.Service.engineManager.declineDisabled(); } else { // Log out if the user canceled the dialog. return this._fxaService.signOut(); } } }).then(() => { return this._fetchSyncKeyBundle(); }).then(() => {