suzanne.soy/zotero
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Disable connector switching for 5.0 beta

Browse Source 
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.
This commit is contained in:
Dan Stillman 2016-05-08 22:38:58 -04:00
parent 216900094b
commit 317b1dfa0f
3 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
chrome/content/zotero/xpcom/ipc.js
View File

@ -30,6 +30,9 @@ Zotero.IPC = new function() {
* Initialize pipe for communication with connector * Initialize pipe for communication with connector
*/ */
this.init = function() { this.init = function() {
// TEMP: Disabled for 5.0 Beta
return;
if(!Zotero.isWin) { // no pipe support on Fx 3.6 if(!Zotero.isWin) { // no pipe support on Fx 3.6
_instancePipe = _getPipeDirectory(); _instancePipe = _getPipeDirectory();
if(!_instancePipe.exists()) { if(!_instancePipe.exists()) {

3
chrome/content/zotero/xpcom/zotero.js
View File

@ -798,6 +798,8 @@ Components.utils.import("resource://gre/modules/osfile.jsm");
} }
// Storage busy // Storage busy
else if (e.message.endsWith('2153971713')) { else if (e.message.endsWith('2153971713')) {
// TEMP: Disabled for 5.0 Beta
/*
if(Zotero.isStandalone) { if(Zotero.isStandalone) {
// Standalone should force Fx to release lock // Standalone should force Fx to release lock
if(!haveReleasedLock && Zotero.IPC.broadcast("releaseLock")) { if(!haveReleasedLock && Zotero.IPC.broadcast("releaseLock")) {
@ -821,6 +823,7 @@ Components.utils.import("resource://gre/modules/osfile.jsm");
throw "ZOTERO_SHOULD_START_AS_CONNECTOR"; throw "ZOTERO_SHOULD_START_AS_CONNECTOR";
} }
} }
*/
var msg = Zotero.localeJoin([ var msg = Zotero.localeJoin([
Zotero.getString('startupError.databaseInUse'), Zotero.getString('startupError.databaseInUse'),

3
components/zotero-service.js
View File

@ -423,6 +423,8 @@ ZoteroCommandLineHandler.prototype = {
} }
// handler for Windows IPC commands // handler for Windows IPC commands
// TEMP: Disabled for 5.0 Beta
/*
var ipcParam = cmdLine.handleFlagWithParam("ZoteroIPC", false); var ipcParam = cmdLine.handleFlagWithParam("ZoteroIPC", false);
if(ipcParam) { if(ipcParam) {
// Don't open a new window // Don't open a new window
@ -430,6 +432,7 @@ ZoteroCommandLineHandler.prototype = {
var Zotero = this.Zotero; var Zotero = this.Zotero;
Zotero.setTimeout(function() { Zotero.IPC.parsePipeInput(ipcParam) }, 0); Zotero.setTimeout(function() { Zotero.IPC.parsePipeInput(ipcParam) }, 0);
} }
*/
// special handler for "zotero" URIs at the command line to prevent them from opening a new // special handler for "zotero" URIs at the command line to prevent them from opening a new
// window // window