From f3a6fae90cef9b04f423faecfe3e522bc699a83b Mon Sep 17 00:00:00 2001
From: David Ascher <david@mozillamessaging.com>
Date: Fri, 4 Sep 2009 10:05:02 -0700
Subject: [PATCH] imported patch quicksearch_sizing

--HG--
branch : gloda-facet
---
 mail/base/content/extraCustomizeItems.xul   |  6 ++++--
 mail/base/content/search.xml                | 17 ++++++++++-------
 mailnews/db/gloda/content/glodacomplete.css |  1 -
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/mail/base/content/extraCustomizeItems.xul b/mail/base/content/extraCustomizeItems.xul
index 4f5dca4d1e..462e7e0e59 100644
--- a/mail/base/content/extraCustomizeItems.xul
+++ b/mail/base/content/extraCustomizeItems.xul
@@ -59,12 +59,14 @@
 
   <toolbarpalette id="MailToolbarPalette">
     <!-- gloda search widget; provides global (message) searching.  -->
-    <toolbaritem id="gloda-search" insertafter="search-container"
+    <toolbaritem id="gloda-search" insertafter="button-stop"
                  title="&glodaSearch.title;"
                  align="center"
+                 flex="1000"
                  class="chromeclass-toolbar-additional">
-        <textbox id="searchInput" flex="1"
+        <textbox id="searchInput" 
                  chromedir="ltr"
+                 flex="1"
                  searchCriteria="true"
                  type="glodacomplete"
                  searchbutton="true"
diff --git a/mail/base/content/search.xml b/mail/base/content/search.xml
index 2108c7f8fe..b3892874dd 100644
--- a/mail/base/content/search.xml
+++ b/mail/base/content/search.xml
@@ -187,7 +187,7 @@
   
           var prefBranch =
               Components.classes['@mozilla.org/preferences-service;1'].
-              getService(Components.interfaces.nsIPrefBranch);
+              getService(Components.interfaces.nsIPrefBranch2);
           prefBranch.addObserver("mailnews.database.global.indexer.enabled", this._prefObserver, false);
 
           this.glodaCompleter =
@@ -229,7 +229,7 @@
           this.menupopup.appendChild(saveAsVF);
           this.updateSaveItem();
           this.input = "";
-          this.glodaEnabled = gPrefBranch.getBoolPref("mailnews.database.global.indexer.enabled");
+          this.glodaEnabled = prefBranch.getBoolPref("mailnews.database.global.indexer.enabled");
           this.searchMode = this.glodaEnabled ? "global" : String(quickSearchModes[QuickSearchConstants.kQuickSearchFromOrSubject].value);
         } catch (e) {
           logException(e);
@@ -279,11 +279,14 @@
       <property name="searchMode" onget="return this.mQuickSearchMode;"
                 onset="this.mQuickSearchMode = val;
                        this.menupopup.setAttribute('value', val);
-                       let currentTabInfo = document.getElementById('tabmail').currentTabInfo;
-                       this.menupopup.getElementsByAttribute('value', this.searchMode)[0].setAttribute('checked', 'true');
-                       if (currentTabInfo)
-                          currentTabInfo.searchState = this.state;
-                       this.updateEmptyText();"/>
+                       let tabmail = document.getElementById('tabmail');
+                       if (tabmail) { /* if not in the customize toolbar */
+                         let currentTabInfo = tabmail.currentTabInfo;
+                         this.menupopup.getElementsByAttribute('value', this.searchMode)[0].setAttribute('checked', 'true');
+                         if (currentTabInfo)
+                            currentTabInfo.searchState = this.state;
+                         this.updateEmptyText();
+                       }"/>
       <field name="_glodaEnabled"/>
       <property name="glodaEnabled" onget="return this._glodaEnabled"
                 onset="try {this.showGlodaItems(val); this._glodaEnabled = val;} catch(e) {logException(e);}"/> 
diff --git a/mailnews/db/gloda/content/glodacomplete.css b/mailnews/db/gloda/content/glodacomplete.css
index d0b7fffa05..25d17fd50d 100644
--- a/mailnews/db/gloda/content/glodacomplete.css
+++ b/mailnews/db/gloda/content/glodacomplete.css
@@ -1,6 +1,5 @@
 textbox[type="glodacomplete"] {
   -moz-binding: url("chrome://global/content/bindings/autocomplete.xml#autocomplete");
-  width: 400px;
 }
 
 panel[type="glodacomplete-richlistbox"] {