2.1.2 minor version bump

README.md

@@ -7,6 +7,8 @@ The Bookmarks Deiconizer addon removes these unsightly abominations from your to
 
 ## Changelog ##
 
+**v2.1.2** - revved maxversion
+
 **v2.1.1** - fixed problem not deiconizing on startup.
 
 **v2.1** - fixed multiple windows issue at startup.

lib/main.js

@@ -32,11 +32,7 @@
 
 const {Cc,Ci,Cm,Cr,Cu} = require("chrome");
 
-var jsm = {};
-
-Cu.import("resource://gre/modules/Services.jsm", jsm);
-
-var services = exports.services = jsm.Services;
+let windows = require("window").browserWindows;
 
 windowOpenedCallback = function(aSubject, aTopic, aObject) {
   if (aTopic != "domwindowopened")
@@ -58,11 +54,8 @@ deiconizeToolbar = function(aDocument) {
 };
 
 exports.main = function (options, callbacks) {
-  let xulWindows = services.wm.getXULWindowEnumerator(null);
-
-  while(xulWindows.hasMoreElements()) {
-    let recentBrowser = xulWindows.getNext();
-    let docShell = recentBrowser.QueryInterface(Ci.nsIXULWindow).docShell;
+  for each (let win = windows) {
+    let docShell = win.QueryInterface(Ci.nsIXULWindow).docShell;
     let containedDocShells = docShell.getDocShellEnumerator(
                               Ci.nsIDocShellTreeItem.typeChrome,
                               Ci.nsIDocShell.ENUMERATE_FORWARDS);
@@ -78,6 +71,7 @@ exports.main = function (options, callbacks) {
         deiconizeToolbar(childDoc);
     }
   }
-  services.ww.registerNotification(windowOpenedCallback, "domwindowopened", false);
+
+  windows.on("open", windowOpenedCallback);
 };
 

package.json

@@ -2,7 +2,7 @@
     "id": "jid0-TRew4ErAYBTQ3UFPwfAI5aBEvlg", 
     "description": "Remove icons from Bookmarks Toolbar.", 
     "author": "Rob Campbell (http://antennasoft.net/robcee) <rob@antennasoft.net>",
-    "version": "2.1.1",
+    "version": "2.1.2",
     "url": "http://antennasoft.net/robcee/bookmarks-deiconizer/",
     "license": "Unlicense"
 }