mirrors/zotero
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

enable integration pipe on patched 2.0b9pre builds (unpatched builds will log an error)

Browse source
This commit is contained in:
Simon Kornblith 2010-12-20 05:11:22 +00:00
parent 7a4782073c
commit e681b4698f
1 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
chrome/content/zotero/xpcom/integration.js
View file

@ -111,8 +111,12 @@ Zotero.Integration = new function() {
} }
// try to initialize pipe // try to initialize pipe
var pipeInitialized = (Zotero.isFx4 ? _initializeIntegrationPipeFx4(_fifoFile) : try {
_initializeIntegrationPipeFx36(_fifoFile)); var pipeInitialized = (Zotero.isFx4 ? _initializeIntegrationPipeFx4(_fifoFile) :
_initializeIntegrationPipeFx36(_fifoFile));
} catch(e) {
Components.utils.reportError(e);
}
if(pipeInitialized) { if(pipeInitialized) {
var me = this; var me = this;
@ -183,7 +187,7 @@ Zotero.Integration = new function() {
.getService(Components.interfaces.nsIVersionComparator); .getService(Components.interfaces.nsIVersionComparator);
var appInfo = Components.classes["@mozilla.org/xre/app-info;1"]. var appInfo = Components.classes["@mozilla.org/xre/app-info;1"].
getService(Components.interfaces.nsIXULAppInfo); getService(Components.interfaces.nsIXULAppInfo);
if(verComp.compare("2.0b9", appInfo.version) > 0) { if(verComp.compare("2.0b9pre", appInfo.version) > 0) {
Components.utils.reportError("Zotero word processor integration requires "+ Components.utils.reportError("Zotero word processor integration requires "+
"Firefox 4.0b9 or later. Please update to the latest Firefox 4.0 beta."); "Firefox 4.0b9 or later. Please update to the latest Firefox 4.0 beta.");
return false; return false;