From da7a582b5f5831da0f6b74ea53bef77477fd34d4 Mon Sep 17 00:00:00 2001
From: "gavin%gavinsharp.com" <gavin%gavinsharp.com>
Date: Sat, 26 Aug 2006 15:28:56 +0000
Subject: [PATCH] Bug 338378: When customizing toolbars, search box has grey
 text and I-beam cursor and is hard to drag, patch by Dave Townsend
 <mossop.bugzilla@blueprintit.co.uk>, r=me

---
 browser/components/search/content/search.xml |  2 ++
 browser/themes/pinstripe/browser/browser.css |  5 +++++
 browser/themes/winstripe/browser/browser.css | 10 +++++-----
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/browser/components/search/content/search.xml b/browser/components/search/content/search.xml
index 1b5d78064279..fcf649ac43e1 100644
--- a/browser/components/search/content/search.xml
+++ b/browser/components/search/content/search.xml
@@ -100,6 +100,8 @@
     <implementation implements="nsIObserver">
 
       <constructor><![CDATA[
+        if (this.parentNode.parentNode.localName == "toolbarpaletteitem")
+          return;
         setTimeout(function (a) { a.init(); }, 0, this);
       ]]></constructor>
 
diff --git a/browser/themes/pinstripe/browser/browser.css b/browser/themes/pinstripe/browser/browser.css
index 2d16eec31461..5022611565b8 100755
--- a/browser/themes/pinstripe/browser/browser.css
+++ b/browser/themes/pinstripe/browser/browser.css
@@ -41,6 +41,7 @@
 @import url("chrome://global/skin/");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+@namespace html url("http://www.w3.org/1999/xhtml");
 
 #toolbar-menubar {
 	display: none;
@@ -54,6 +55,10 @@
   color: GrayText;
 }
 	
+#wrapper-search-container #searchbar html|*.textbox-input {
+  visibility: hidden;
+}
+
 /* ::::: bookmark buttons ::::: */
 
 .bookmark-item[container] {
diff --git a/browser/themes/winstripe/browser/browser.css b/browser/themes/winstripe/browser/browser.css
index b902c55d95f6..15c57803d301 100644
--- a/browser/themes/winstripe/browser/browser.css
+++ b/browser/themes/winstripe/browser/browser.css
@@ -42,6 +42,7 @@
 @import url("chrome://global/skin/");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+@namespace html url("http://www.w3.org/1999/xhtml");
 
 #menubar-items {
   -moz-box-orient: vertical; /* for flex hack */
@@ -90,6 +91,10 @@
   color: GrayText;
 }
 
+#wrapper-search-container #searchbar html|*.textbox-input {
+  visibility: hidden;
+}
+
 /* ::::: bookmark buttons ::::: */
 
 toolbarbutton.bookmark-item {
@@ -131,11 +136,6 @@ toolbarbutton.bookmark-item[open="true"] {
   background: url("chrome://browser/skin/Bookmarks-folder.png") no-repeat !important;
 }
 
-#wrapper-search-container .searchbar-textbox {
-  -moz-user-input: disabled;
-  -moz-user-focus: normal;
-}
-
 .bookmarks-toolbar-customize {
   display: none;
   max-width: 15em !important;