From a8f9b704e3832eb76b5c14894cf5c0ea0b6cefe1 Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Mon, 28 Apr 2014 19:26:53 -0400
Subject: [PATCH] Don't show "Status bar icon:" pref for Firefox 29+

---
 chrome/content/zotero/preferences/preferences_general.js  | 8 ++++++++
 .../zotero/preferences/preferences_general_firefox.xul    | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/chrome/content/zotero/preferences/preferences_general.js b/chrome/content/zotero/preferences/preferences_general.js
index 7d97fa2e90..ec129753c1 100644
--- a/chrome/content/zotero/preferences/preferences_general.js
+++ b/chrome/content/zotero/preferences/preferences_general.js
@@ -34,6 +34,14 @@ Zotero_Preferences.General = {
 				'zotero.preferences.launchNonNativeFiles', Zotero.appName
 			);
 		}
+		
+		// Only show icon options for Firefox <29
+		if (Zotero.platformMajorVersion < 29) {
+			let statusBarRow = document.getElementById('zotero-prefpane-general-statusBarIcon-row');
+			if (statusBarRow) {
+				statusBarRow.hidden = false;
+			}
+		}
 	},
 	
 	/**
diff --git a/chrome/content/zotero/preferences/preferences_general_firefox.xul b/chrome/content/zotero/preferences/preferences_general_firefox.xul
index 197f5bf019..d658e35f71 100644
--- a/chrome/content/zotero/preferences/preferences_general_firefox.xul
+++ b/chrome/content/zotero/preferences/preferences_general_firefox.xul
@@ -48,7 +48,7 @@
 							<radio id="zotero-prefpane-general-showIn-appTab" label="&zotero.preferences.showIn.appTab;" value="3"/>
 						</radiogroup>
 					</row>
-					<row position="2" id="zotero-prefpane-general-statusBarIcon-row">
+					<row position="2" id="zotero-prefpane-general-statusBarIcon-row" hidden="true">
 						<hbox align="center">
 							<label id="statusBarIcon-label" value="&zotero.preferences.statusBarIcon;" control="statusBarIcon"/>
 						</hbox>