From 841c6f5b7b4be068e509a9f431eab3a729a05284 Mon Sep 17 00:00:00 2001
From: Simon Kornblith <simon@simonster.com>
Date: Wed, 3 Aug 2011 17:17:14 +0000
Subject: [PATCH] - Don't set a minimum height for the preferences. I think
 this was a workaround for a very old bug. - Don't let proxy tree flex. I
 think this fixes Linux preferences-related issues.

---
 chrome/content/zotero/preferences/preferences.xul         | 3 +--
 chrome/content/zotero/preferences/preferences_firefox.xul | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/chrome/content/zotero/preferences/preferences.xul b/chrome/content/zotero/preferences/preferences.xul
index a29c2b9951..b811793e9b 100644
--- a/chrome/content/zotero/preferences/preferences.xul
+++ b/chrome/content/zotero/preferences/preferences.xul
@@ -41,8 +41,7 @@ To add a new preference:
 
 -->
 <prefwindow id="zotero-prefs" title="&zotero.preferences.title;" onload="init()" onunload="Zotero_Preferences.onUnload()"
-		windowtype="zotero:pref" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-		style="min-height: 600px">
+		windowtype="zotero:pref" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 	
 	<prefpane id="zotero-prefpane-general"
 						label="&zotero.preferences.prefpane.general;"
diff --git a/chrome/content/zotero/preferences/preferences_firefox.xul b/chrome/content/zotero/preferences/preferences_firefox.xul
index e947209eb4..9089690edc 100644
--- a/chrome/content/zotero/preferences/preferences_firefox.xul
+++ b/chrome/content/zotero/preferences/preferences_firefox.xul
@@ -101,7 +101,7 @@ To add a new preference:
 			<groupbox flex="1" id="proxyGroup">
 				<caption label="&zotero.preferences.proxies.configured;"/>
 				
-				<tree flex="1" id="proxyTree" hidecolumnpicker="true" rows="6" seltype="single"
+				<tree id="proxyTree" hidecolumnpicker="true" rows="6" seltype="single"
 						ondblclick="showProxyEditor(this.currentIndex)" onselect="document.getElementById('proxyTree-delete').disabled = undefined"
 						onkeypress="if (event.keyCode == event.DOM_VK_DELETE) { deleteProxy(); }">
 					<treecols>