Bug 400838 - "The Search: label in Places Organizer is a button, though it should not be" [p=dao r=Mano a=blocking-firefox3+]

browser/components/places/content/advancedSearch.inc

@@ -35,7 +35,7 @@
 # ***** END LICENSE BLOCK ***** 
 
 <vbox id="advancedSearch">
-  <hbox>
+  <hbox align="center">
     <label value="&advancedSearch.match.label;" control="advancedSearchType"/> 
     <menulist id="advancedSearchType"
               oncommand="PlacesQueryBuilder.doSearch();">

browser/components/places/content/places.xul

@@ -377,8 +377,8 @@
             </deck>
           </hbox>
           <vbox id="searchModifiers" hidden="true">
-            <toolbar id="organizerScopeBar" class="chromeclass-toolbar">
-              <toolbarbutton id="scopeBarTitle" label="&search.label;"/>
+            <toolbar id="organizerScopeBar" class="chromeclass-toolbar" align="center">
+              <label id="scopeBarTitle" value="&search.label;"/>
               <toolbarbutton id="scopeBarFolder" type="radio" group="scopeBar" 
                              oncommand="PlacesQueryBuilder.onScopeSelected(this);"
                              label="&search.scopeFolder.label;"/>