From 15c79766e86e92b7d94f1771459c9aaad8d40c7a Mon Sep 17 00:00:00 2001
From: Simon Kornblith <simon@simonster.com>
Date: Wed, 21 Sep 2011 20:30:37 +0000
Subject: [PATCH] Hackish way of avoiding async AddonManager APIs during
 initialization

---
 chrome.manifest                       | 1 +
 chrome/content/zotero/xpcom/zotero.js | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/chrome.manifest b/chrome.manifest
index c5d522580..9f3a53a72 100644
--- a/chrome.manifest
+++ b/chrome.manifest
@@ -1,5 +1,6 @@
 content	zotero				chrome/content/zotero/
 content	zotero-platform		chrome/content/zotero-platform/		platform
+content zotero-resource		resource/
 
 locale	zotero	en-US		chrome/locale/en-US/zotero/
 locale	zotero	af-ZA		chrome/locale/af-ZA/zotero/
diff --git a/chrome/content/zotero/xpcom/zotero.js b/chrome/content/zotero/xpcom/zotero.js
index c83a33e20..3e230266e 100644
--- a/chrome/content/zotero/xpcom/zotero.js
+++ b/chrome/content/zotero/xpcom/zotero.js
@@ -797,9 +797,9 @@ if(appInfo.platformVersion[0] >= 2) {
 			.getService(Components.interfaces.nsIChromeRegistry);
 		var ioService = Components.classes["@mozilla.org/network/io-service;1"]  
 			.getService(Components.interfaces.nsIIOService);  
-		var zoteroURI = ioService.newURI("chrome://zotero/content/", "UTF-8", null);
+		var zoteroURI = ioService.newURI("chrome://zotero-resource/content/", "UTF-8", null);
 		zoteroURI = cr.convertChromeURL(zoteroURI).QueryInterface(Components.interfaces.nsIFileURL);
-		return zoteroURI.file.parent.parent.parent.parent;
+		return zoteroURI.file.parent.parent;
 	}
 	
 	function getDefaultProfile(prefDir) {