From 27cc988fffee085d8363cbdedefa7b6329429243 Mon Sep 17 00:00:00 2001
From: Kris Maglione <maglione.k@gmail.com>
Date: Wed, 29 Dec 2010 01:49:03 -0500
Subject: [PATCH] [bootstrap] Fix running from an xpi on Gecko 2.

---
 common/bootstrap.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/common/bootstrap.js b/common/bootstrap.js
index 89a63dec..f7c3c601 100755
--- a/common/bootstrap.js
+++ b/common/bootstrap.js
@@ -64,7 +64,7 @@ function startup(data, reason) {
             }
         else
             getURI = function getURI(path)
-                Services.io.newURI("jar:" + Services.io.newFileURI(file).spec + "!" + path);
+                Services.io.newURI("jar:" + Services.io.newFileURI(basePath).spec + "!/" + path, null, null);
         try {
             init();
         }
@@ -157,6 +157,7 @@ function init() {
 
     require(global, "prefs");
     require(global, "services");
+    Cu.import("resource://gre/modules/Services.jsm", global);
 
     services.subscriptLoader.loadSubScript(
         url("defaults/preferences/dactyl.js"),