diff --git a/chrome/content/zotero/xpcom/ipc.js b/chrome/content/zotero/xpcom/ipc.js index 86cbb8b1c..0912e423c 100755 --- a/chrome/content/zotero/xpcom/ipc.js +++ b/chrome/content/zotero/xpcom/ipc.js @@ -30,9 +30,6 @@ 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 88bd76234..414c42455 100644 --- a/chrome/content/zotero/xpcom/zotero.js +++ b/chrome/content/zotero/xpcom/zotero.js @@ -811,8 +811,6 @@ 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")) { @@ -836,7 +834,6 @@ 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 9007ace2f..0672dcf2a 100644 --- a/components/zotero-service.js +++ b/components/zotero-service.js @@ -424,8 +424,6 @@ 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 @@ -433,7 +431,6 @@ 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