From 40222ebf9378e5698c8af3bb3c59896f37f6960a Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Thu, 4 Feb 2010 02:54:16 +0000
Subject: [PATCH] Remove sync/storage debugging options from Actions menu

---
 chrome/content/zotero/overlay.js  |  4 +---
 chrome/content/zotero/overlay.xul | 13 ++++---------
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/chrome/content/zotero/overlay.js b/chrome/content/zotero/overlay.js
index d7e5fc7db..fc0abb4ff 100644
--- a/chrome/content/zotero/overlay.js
+++ b/chrome/content/zotero/overlay.js
@@ -197,12 +197,10 @@ var ZoteroPane = new function()
 		// Hide sync debugging menu by default
 		if (Zotero.Prefs.get('sync.debugMenu')) {
 			var sep = document.getElementById('zotero-tb-actions-sync-separator');
-			var menuitems = [];
+			sep.hidden = false;
 			sep.nextSibling.hidden = false;
 			sep.nextSibling.nextSibling.hidden = false;
 			sep.nextSibling.nextSibling.nextSibling.hidden = false;
-			sep.nextSibling.nextSibling.nextSibling.nextSibling.hidden = false;
-			sep.nextSibling.nextSibling.nextSibling.nextSibling.nextSibling.nextSibling.hidden = false;
 		}
 		
 		if (Zotero.Prefs.get('debugShowDuplicates')) {
diff --git a/chrome/content/zotero/overlay.xul b/chrome/content/zotero/overlay.xul
index 8a9c58c68..669998209 100644
--- a/chrome/content/zotero/overlay.xul
+++ b/chrome/content/zotero/overlay.xul
@@ -160,15 +160,10 @@
 								<menuitem id="zotero-tb-actions-timeline" label="&zotero.toolbar.timeline.label;" oncommand="Zotero_Timeline_Interface.loadTimeline()"/>
 								<!-- TODO: localize <menuitem id="zotero-tb-actions-duplicate" label="&zotero.toolbar.duplicate.label;" oncommand="ZoteroPane.showDuplicates()"/>-->
 								<menuitem id="zotero-tb-actions-showDuplicates" label="Show Duplicates" oncommand="ZoteroPane.showDuplicates()" hidden="true"/>
-								<menuseparator id="zotero-tb-actions-sync-separator"/>
-								<menuitem hidden="true" label="Sync Debugging" disabled="true"/>
-								<menuitem hidden="true" label="  Clear Server Data" oncommand="Zotero.Sync.Server.clear()"/>
-								<menuitem hidden="true" label="  Reset Server Lock" oncommand="Zotero.Sync.Server.resetServer()"/>
-								<menuitem hidden="true" label="  Reset Client" oncommand="Zotero.Sync.Server.resetClient()"/>
-								<menuitem label="Storage Debugging" disabled="true"/>
-								<menuitem hidden="true" label="  Reset Storage History" oncommand="Zotero.Sync.Storage.resetAllSyncStates()"/>
-								<menuitem label="  Purge Deleted Storage Files" oncommand="Zotero.Sync.Storage.purgeDeletedStorageFiles('webdav', function(results) { Zotero.debug(results); })"/>
-								<menuitem label="  Purge Orphaned Storage Files" oncommand="Zotero.Sync.Storage.purgeOrphanedStorageFiles('webdav', function(results) { Zotero.debug(results); })"/>
+								<menuseparator hidden="true" id="zotero-tb-actions-sync-separator"/>
+								<menuitem hidden="true" label="WebDAV Sync Debugging" disabled="true"/>
+								<menuitem hidden="true" label="  Purge Deleted Storage Files" oncommand="Zotero.Sync.Storage.purgeDeletedStorageFiles('webdav', function(results) { Zotero.debug(results); })"/>
+								<menuitem hidden="true"  label="  Purge Orphaned Storage Files" oncommand="Zotero.Sync.Storage.purgeOrphanedStorageFiles('webdav', function(results) { Zotero.debug(results); })"/>
 								<menuseparator id="zotero-tb-actions-separator"/>
 								<menuitem id="zotero-tb-actions-prefs" label="&zotero.toolbar.preferences.label;"
 									oncommand="ZoteroPane.openPreferences()"/>