From f0c4eec238944ab0961cef27fed230b48a70052e Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Mon, 1 Sep 2008 08:09:37 +0000
Subject: [PATCH] Fix sync icon error handling (trunk and SP2 tag)

---
 chrome/content/zotero/overlay.xul      | 2 +-
 chrome/content/zotero/xpcom/storage.js | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/chrome/content/zotero/overlay.xul b/chrome/content/zotero/overlay.xul
index 24d96bae67..6e88c094df 100644
--- a/chrome/content/zotero/overlay.xul
+++ b/chrome/content/zotero/overlay.xul
@@ -342,7 +342,7 @@
 					<toolbarbutton id="zotero-tb-sync" tooltip="_child"
 							oncommand="Zotero.Sync.Runner.sync()">
 						<tooltip
-								onpopupshowing="if (Zotero.Sync.Server.lastSyncError) { this.firstChild.nextSibling.value = 'Last error: ' + Zotero.Sync.Server.lastSyncError; return; } this.firstChild.nextSibling.value = 'Last sync: ' + (Zotero.Sync.Server.lastLocalSyncTime ? new Date(Zotero.Sync.Server.lastLocalSyncTime * 1000).toLocaleString() : 'Not yet synced')"
+								onpopupshowing="if (Zotero.Sync.Runner.lastSyncError) { this.firstChild.nextSibling.value = 'Last error: ' + Zotero.Sync.Runner.lastSyncError; return; } this.firstChild.nextSibling.value = 'Last sync: ' + (Zotero.Sync.Server.lastLocalSyncTime ? new Date(Zotero.Sync.Server.lastLocalSyncTime * 1000).toLocaleString() : 'Not yet synced')"
 								noautohide="true"><!-- TODO: localize -->
 							<label value="Sync with Zotero Server"/>
 							<label id="zotero-last-sync-time"/>
diff --git a/chrome/content/zotero/xpcom/storage.js b/chrome/content/zotero/xpcom/storage.js
index ada1174464..cbb7abf3be 100644
--- a/chrome/content/zotero/xpcom/storage.js
+++ b/chrome/content/zotero/xpcom/storage.js
@@ -1964,13 +1964,13 @@ Zotero.Sync.Storage = new function () {
 		_syncInProgress = false;
 		Zotero.DB.rollbackAllTransactions();
 		
-		Zotero.Sync.Server.setSyncIcon('error');
+		Zotero.Sync.Runner.setSyncIcon('error');
 		
 		if (e.name) {
-			Zotero.Sync.Server.lastSyncError = e.name;
+			Zotero.Sync.Runner.lastSyncError = e.name;
 		}
 		else {
-			Zotero.Sync.Server.lastSyncError = e;
+			Zotero.Sync.Runner.lastSyncError = e;
 		}
 		Zotero.debug(e, 1);
 		Zotero.Sync.Runner.reset();