www

commit 5bd30580c51138fbf09548bff3bb7f95927d0bc6
parent 908b96ccc460a05a1fa7f28ce9814827c6cca2a2
Author: Simon Kornblith <simon@simonster.com>
Date:   Sat,  2 Oct 2010 20:08:16 +0000

add hidden pref for enabling/disabling connector


Diffstat:
M
chrome/content/zotero/xpcom/zotero.js
 | 
5
++++-
M
defaults/preferences/zotero.js
 | 
3
+++

2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/chrome/content/zotero/xpcom/zotero.js b/chrome/content/zotero/xpcom/zotero.js
@@ -476,7 +476,7 @@ var Zotero = new function(){
 		// Initialize various services
 		Zotero.Integration.init();
 		
-		if(Zotero.isStandalone) {
+		if(Zotero.Prefs.get("connector.enabled")) {
 			Zotero.Connector.init();
 		}
 		
@@ -796,6 +796,9 @@ var Zotero = new function(){
 					Zotero.Prefs.set('dataDir', file.persistentDescriptor);
 					Zotero.Prefs.set('lastDataDir', file.path);
 					Zotero.Prefs.set('useDataDir', true);
+					
+					// Enable connector by default, even if it was disabled
+					Zotero.Prefs.set('connector.enabled', true);
 					break;
 				}
 				else {
diff --git a/defaults/preferences/zotero.js b/defaults/preferences/zotero.js
@@ -111,6 +111,9 @@ pref("extensions.zotero.connector.port", 23119);	// ascii "ZO"
 // Zeroconf
 pref("extensions.zotero.zeroconf.server.enabled", false);
 
+// Connector
+pref("extensions.zotero.connector.enabled", false);
+
 // Zotero Commons
 pref("extensions.zotero.commons.enabled", false);
 pref("extensions.zotero.commons.accessKey", '');