Bug 945753 - Australis should update currentset attribute with placements, not currentSet property, to avoid nixing non-existant items ourselves, r=mconley

--HG--
extra : rebase_source : 3b1639f34f2ded0630d531841bccf32fee15cdbc

browser/components/customizableui/src/CustomizableUI.jsm

@@ -711,7 +711,7 @@ let CustomizableUIInternal = {
       this.notifyListeners("onWidgetAfterDOMChange", widgetNode, null, container, true);
 
       if (area.get("type") == CustomizableUI.TYPE_TOOLBAR) {
-        areaNode.setAttribute("currentset", areaNode.currentSet);
+        areaNode.setAttribute("currentset", gPlacements.get(aArea).join(','));
       }
 
       let windowCache = gSingleWrapperCache.get(window);
@@ -866,7 +866,7 @@ let CustomizableUIInternal = {
     this.insertWidgetBefore(widgetNode, nextNode, insertionContainer, areaId);
 
     if (gAreas.get(areaId).get("type") == CustomizableUI.TYPE_TOOLBAR) {
-      aAreaNode.setAttribute("currentset", aAreaNode.currentSet);
+      areaNode.setAttribute("currentset", gPlacements.get(areaId).join(','));
     }
   },