From 1bf13aaa1a445fe630f5e177ac92131dcd94d304 Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Mon, 30 Jun 2008 01:01:53 +0000
Subject: [PATCH] Part of auto-sync support

---
 chrome/content/zotero/xpcom/zotero.js | 1 +
 components/zotero-service.js          | 1 +
 2 files changed, 2 insertions(+)

diff --git a/chrome/content/zotero/xpcom/zotero.js b/chrome/content/zotero/xpcom/zotero.js
index fba547ca3b..c112f3aa4c 100644
--- a/chrome/content/zotero/xpcom/zotero.js
+++ b/chrome/content/zotero/xpcom/zotero.js
@@ -266,6 +266,7 @@ var Zotero = new function(){
 		Zotero.Zeroconf.init();
 		
 		Zotero.Sync.init();
+		Zotero.Sync.Server.init();
 		
 		this.initialized = true;
 		
diff --git a/components/zotero-service.js b/components/zotero-service.js
index 2ee4ea76cd..3c640ebaa7 100644
--- a/components/zotero-service.js
+++ b/components/zotero-service.js
@@ -83,6 +83,7 @@ function setTimeout(func, ms){
 	// {} implements nsITimerCallback
 	timer.initWithCallback({notify:func}, ms,
 		Components.interfaces.nsITimer.TYPE_ONE_SHOT);
+	return timer;
 }