From 1b1df60725e9b00e3cd0351b4285764c7993c3de Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Mon, 4 Feb 2013 02:05:04 -0500
Subject: [PATCH] Make X-Zotero-Version and RIS/Refer prefs Firefox-only

---
 .../content/zotero/preferences/preferences.xul  | 10 +++-------
 .../zotero/preferences/preferences_firefox.xul  | 17 +++++++++++++++--
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/chrome/content/zotero/preferences/preferences.xul b/chrome/content/zotero/preferences/preferences.xul
index c3f0d5f612..b96bb64a21 100644
--- a/chrome/content/zotero/preferences/preferences.xul
+++ b/chrome/content/zotero/preferences/preferences.xul
@@ -54,8 +54,6 @@ To add a new preference:
 			<preference id="pref-noteFontSize" name="extensions.zotero.note.fontSize" type="string"/>
 			<preference id="pref-automaticScraperUpdates" name="extensions.zotero.automaticScraperUpdates" type="bool"/>
 			<preference id="pref-reportTranslationFailure" name="extensions.zotero.reportTranslationFailure" type="bool"/>
-			<preference id="pref-zoteroDotOrgVersionHeader" name="extensions.zotero.zoteroDotOrgVersionHeader" type="bool"/>
-			<preference id="pref-parseEndNoteMIMETypes" name="extensions.zotero.parseEndNoteMIMETypes" type="bool" onchange="Zotero.MIMETypeHandler.init()"/>
 			<preference id="pref-automaticSnapshots" name="extensions.zotero.automaticSnapshots" type="bool"/>
 			<preference id="pref-downloadAssociatedFiles" name="extensions.zotero.downloadAssociatedFiles" type="bool"/>
 			<preference id="pref-automaticTags" name="extensions.zotero.automaticTags" type="bool"/>
@@ -126,11 +124,9 @@ To add a new preference:
 			</hbox>
 			
 			<checkbox label="&zotero.preferences.reportTranslationFailure;" preference="pref-reportTranslationFailure"/>
-			<checkbox label="&zotero.preferences.zoteroDotOrgVersionHeader;"
-				tooltiptext="&zotero.preferences.zoteroDotOrgVersionHeader.tooltip;"
-				preference="pref-zoteroDotOrgVersionHeader"/>
-			<checkbox id="parse-ris-checkbox" label="&zotero.preferences.parseRISRefer;" preference="pref-parseEndNoteMIMETypes"/>
-			<checkbox label="&zotero.preferences.automaticSnapshots;" preference="pref-automaticSnapshots"/>
+			<checkbox id="automaticSnapshots-checkbox"
+				label="&zotero.preferences.automaticSnapshots;"
+				preference="pref-automaticSnapshots"/>
 			<checkbox label="&zotero.preferences.downloadAssociatedFiles;" preference="pref-downloadAssociatedFiles"/>
 			<checkbox label="&zotero.preferences.automaticTags;" preference="pref-automaticTags"/>
 			<hbox align="center">
diff --git a/chrome/content/zotero/preferences/preferences_firefox.xul b/chrome/content/zotero/preferences/preferences_firefox.xul
index 7c4894f6a4..0cce975613 100644
--- a/chrome/content/zotero/preferences/preferences_firefox.xul
+++ b/chrome/content/zotero/preferences/preferences_firefox.xul
@@ -49,6 +49,12 @@ To add a new preference:
 				<preference id="pref-showIn" name="extensions.zotero.showIn" type="int"/>
 				<preference id="pref-statusBarIcon" name="extensions.zotero.statusBarIcon" type="int"/>
 				<preference id="pref-launchNonNativeFiles" name="extensions.zotero.launchNonNativeFiles" type="bool"/>
+				<preference id="pref-zoteroDotOrgVersionHeader"
+					name="extensions.zotero.zoteroDotOrgVersionHeader"
+					type="bool"/>
+				<preference id="pref-parseEndNoteMIMETypes"
+					name="extensions.zotero.parseEndNoteMIMETypes"
+					type="bool" onchange="Zotero.MIMETypeHandler.init()"/>
 			</preferences>
 			<groupbox id="zotero-prefpane-general-groupbox">
 				<grid id="zotero-prefpane-general-grid">
@@ -77,11 +83,18 @@ To add a new preference:
 				</grid>
 			</groupbox>
 			<groupbox id="zotero-prefpane-miscellaneous-groupbox">
+				<checkbox label="&zotero.preferences.zoteroDotOrgVersionHeader;"
+					tooltiptext="&zotero.preferences.zoteroDotOrgVersionHeader.tooltip;"
+					preference="pref-zoteroDotOrgVersionHeader"
+					insertbefore="automaticSnapshots-checkbox"/>
 				<checkbox id="launchNonNativeFiles-checkbox"
-					insertbefore="parse-ris-checkbox"
 					preference="pref-launchNonNativeFiles"
 					onsyncfrompreference="return !document.getElementById(this.getAttribute('preference')).value"
-					onsynctopreference="return !this.checked"/>
+					onsynctopreference="return !this.checked"
+					insertbefore="automaticSnapshots-checkbox"/>
+				<checkbox label="&zotero.preferences.parseRISRefer;"
+					preference="pref-parseEndNoteMIMETypes"
+					insertbefore="automaticSnapshots-checkbox"/>
 			</groupbox>
 		</prefpane>