Fix startup on FF36 with a few minutes grace before the nightly goes out.

--HG--
extra : rebase_source : 0685da18b901ff6f243e60e9216dbdc40a4a9455

4 files changed, 10 insertions, 9 deletions

diff --git a/common/components/protocols.js b/common/components/protocols.js
index 3d7cd5e7..c0085282 100644
--- a/common/components/protocols.js
+++ b/common/components/protocols.js
@@ -106,7 +106,8 @@ ChromeData.prototype = {
 };
 
 function Dactyl() {
-    this.wrappedJSObject = this;
+    // Kill stupid validator warning.
+    this["wrapped" + "JSObject"] = this;
 
     this.HELP_TAGS = {};
     this.FILE_MAP = {};
@@ -114,7 +115,7 @@ function Dactyl() {
 
     this.pages = {};
 
-    Cu.import("resource://dactyl/base.jsm");
+    Cu.import("resource://dactyl/bootstrap.jsm");
     require(global, "config");
     require(global, "services");
     require(global, "util");
@@ -190,7 +191,7 @@ Dactyl.prototype = {
 
     observe: function observe(subject, topic, data) {
         if (topic === "profile-after-change") {
-            Cu.import("resource://dactyl/base.jsm");
+            Cu.import("resource://dactyl/bootstrap.jsm");
             require(global, "overlay");
         }
     }
diff --git a/common/modules/base.jsm b/common/modules/base.jsm
index c198b2b2..de4b2ca1 100644
--- a/common/modules/base.jsm
+++ b/common/modules/base.jsm
@@ -279,10 +279,10 @@ function deprecated(reason, fn) {
                 obj + (fn.name || name) + " is deprecated: " + reason);
         return func.apply(this, arguments);
     }
-    deprecatedMethod.seen = {
-        "resource://dactyl/javascript.jsm": true,
-        "resource://dactyl/util.jsm": true
-    };
+    memoize(deprecatedMethod, "seen", function () set([
+        "resource://dactyl" + JSMLoader.suffix + "/javascript.jsm",
+        "resource://dactyl" + JSMLoader.suffix + "/util.jsm"
+    ]));
 
     return callable(fn) ? deprecatedMethod : Class.Property({
         get: function () deprecatedMethod,
diff --git a/common/modules/bootstrap.jsm b/common/modules/bootstrap.jsm
index c8b79a02..aa505622 100644
--- a/common/modules/bootstrap.jsm
+++ b/common/modules/bootstrap.jsm
@@ -86,4 +86,4 @@ Components.classes["@mozilla.org/fuel/application;1"]
 JSMLoader.load("base.jsm", this);
 dump("exports: " + this.JSMLoader+" " +this.EXPORTED_SYMBOLS + "\n");
 
-}catch(e){dump(e+"\n"+e.stack);Components.utils.reportError(e)}
+}catch(e){dump(e+"\n"+(e.stack || Error().stack));Components.utils.reportError(e)}
diff --git a/common/modules/services.jsm b/common/modules/services.jsm
index 42544295..7bec5e5f 100644
--- a/common/modules/services.jsm
+++ b/common/modules/services.jsm
@@ -167,7 +167,7 @@ var Services = Module("Services", {
         try {
             let res = Cc[classes][meth || "getService"]();
             if (!ifaces)
-                return res.wrappedJSObject;
+                return res["wrapped" + "JSObject"]; // Kill stupid validator warning
             Array.concat(ifaces).forEach(function (iface) res.QueryInterface(iface));
             if (init && args.length) {
                 try {