From 317b1dfa0f5e7ffb15fef54e6e10f0c28a2c59c7 Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Sun, 8 May 2016 22:38:58 -0400 Subject: [PATCH] Disable connector switching for 5.0 beta Don't start the connector pipe (Mac/Linux), don't listen for IPC on the command-line (Windows), and don't try to release Standalone's lock if DB is busy when Firefox starts. --- chrome/content/zotero/xpcom/ipc.js | 3 +++ chrome/content/zotero/xpcom/zotero.js | 3 +++ components/zotero-service.js | 3 +++ 3 files changed, 9 insertions(+) diff --git a/chrome/content/zotero/xpcom/ipc.js b/chrome/content/zotero/xpcom/ipc.js index 0912e423cc..86cbb8b1ca 100755 --- a/chrome/content/zotero/xpcom/ipc.js +++ b/chrome/content/zotero/xpcom/ipc.js @@ -30,6 +30,9 @@ Zotero.IPC = new function() { * Initialize pipe for communication with connector */ this.init = function() { + // TEMP: Disabled for 5.0 Beta + return; + if(!Zotero.isWin) { // no pipe support on Fx 3.6 _instancePipe = _getPipeDirectory(); if(!_instancePipe.exists()) { diff --git a/chrome/content/zotero/xpcom/zotero.js b/chrome/content/zotero/xpcom/zotero.js index 4917a22eec..e3f099de20 100644 --- a/chrome/content/zotero/xpcom/zotero.js +++ b/chrome/content/zotero/xpcom/zotero.js @@ -798,6 +798,8 @@ Components.utils.import("resource://gre/modules/osfile.jsm"); } // Storage busy else if (e.message.endsWith('2153971713')) { + // TEMP: Disabled for 5.0 Beta + /* if(Zotero.isStandalone) { // Standalone should force Fx to release lock if(!haveReleasedLock && Zotero.IPC.broadcast("releaseLock")) { @@ -821,6 +823,7 @@ Components.utils.import("resource://gre/modules/osfile.jsm"); throw "ZOTERO_SHOULD_START_AS_CONNECTOR"; } } + */ var msg = Zotero.localeJoin([ Zotero.getString('startupError.databaseInUse'), diff --git a/components/zotero-service.js b/components/zotero-service.js index 8ddd7afd67..05442d7847 100644 --- a/components/zotero-service.js +++ b/components/zotero-service.js @@ -423,6 +423,8 @@ ZoteroCommandLineHandler.prototype = { } // handler for Windows IPC commands + // TEMP: Disabled for 5.0 Beta + /* var ipcParam = cmdLine.handleFlagWithParam("ZoteroIPC", false); if(ipcParam) { // Don't open a new window @@ -430,6 +432,7 @@ ZoteroCommandLineHandler.prototype = { var Zotero = this.Zotero; Zotero.setTimeout(function() { Zotero.IPC.parsePipeInput(ipcParam) }, 0); } + */ // special handler for "zotero" URIs at the command line to prevent them from opening a new // window