www

commit c6a366638dd2aa6108425497f7ffe1500a71380b
parent e16a0cb47a79506eb1d253b20197393131ef4ab6
Author: Simon Kornblith <simon@simonster.com>
Date:   Mon, 16 Jan 2012 20:39:08 -0500

Only use Zotero.version from ZOTERO_CONFIG until we can get it from the add-on manager

Diffstat:
M
chrome/content/zotero/xpcom/zotero.js
 | 
15
+++++++++++++--

1 file changed, 13 insertions(+), 2 deletions(-)
diff --git a/chrome/content/zotero/xpcom/zotero.js b/chrome/content/zotero/xpcom/zotero.js
@@ -35,7 +35,7 @@ const ZOTERO_CONFIG = {
 	API_URL: 'https://api.zotero.org/',
 	PREF_BRANCH: 'extensions.zotero.',
 	BOOKMARKLET_URL: 'https://www.zotero.org/bookmarklet/',
-	VERSION: "3.0b3.SOURCE"
+	VERSION: "3.0rc1"
 };
 
 /*
@@ -227,8 +227,19 @@ const ZOTERO_CONFIG = {
 		this.isStandalone = appInfo.ID == ZOTERO_CONFIG['GUID'];
 		if(this.isStandalone) {
 			this.version = appInfo.version;
-		} else {
+		} else if(this.isFx4) {
+			// Use until we collect version from extension manager
 			this.version = ZOTERO_CONFIG['VERSION'];
+			
+			Components.utils.import("resource://gre/modules/AddonManager.jsm");
+			AddonManager.getAddonByID(ZOTERO_CONFIG['GUID'],
+				function(addon) { Zotero.version = addon.version; });
+		} else {
+			var gExtensionManager =
+				Components.classes["@mozilla.org/extensions/manager;1"]
+					.getService(Components.interfaces.nsIExtensionManager);
+			this.version
+				= gExtensionManager.getItemForID(ZOTERO_CONFIG['GUID']).version;
 		}
 		
 		// OS platform