Bug 787306 - Fix bitrotted Sync UX code; r=rnewman
authorGregory Szorc <gps@mozilla.com>
Fri, 31 Aug 2012 11:49:38 -0700
changeset 111062 435e2bd35477170ce31737b0042489a5f5f21f87
parent 111061 e08d1ca919eef4458de91f11975a879ae30a2685
child 111063 597ea0e0cf7ed0e3438492b9c816531a3c2a51a8
push id93
push usernmatsakis@mozilla.com
push dateWed, 31 Oct 2012 21:26:57 +0000
reviewersrnewman
bugs787306, 762230
milestone18.0a1
Bug 787306 - Fix bitrotted Sync UX code; r=rnewman services-central contains lots of changed code. Sync UX changes which landed in inbound for bug 762230 are not compatible with the future.
browser/base/content/sync/setup.js
--- a/browser/base/content/sync/setup.js
+++ b/browser/base/content/sync/setup.js
@@ -925,18 +925,19 @@ var gSyncSetup = {
         } else {
           document.getElementById("passwordCount").hidden = true;
         }
 
         if (!Weave.Service.engineManager.get("prefs").enabled) {
           document.getElementById("prefsWipe").hidden = true;
         }
 
-        if (Weave.Engines.get("addons").enabled) {
-          let ids = Weave.Engines.get("addons")._store.getAllIDs();
+        let addonsEngine = Weave.Service.engineManager.get("addons");
+        if (addonsEngine.enabled) {
+          let ids = addonsEngine._store.getAllIDs();
           let blessedcount = 0;
           for each (let i in ids) {
             if (i) {
               blessedcount++;
             }
           }
           // bug 600141 does not apply, as this does not have to support existing strings
           document.getElementById("addonCount").value =