Bug #267243 --> After doing a quick search, if you quickly load another folder, we don't hide the clear button

all of the time.

Also fixes problems with the quick search bar when moving from a virtual folder to a non virtual folder.

mail/base/content/commandglue.js

@@ -897,9 +897,8 @@ function FolderPaneSelectionChange()
                 gPreQuickSearchView.close();
                 gPreQuickSearchView = null;  
               }
-              var searchInput = document.getElementById("searchInput");  //reset the search input on folder switch
+              
-              if (searchInput) 
+              clearQuickSearchAfterFolderChange();
-                searchInput.value = "";
             }
             ClearMessagePane();
 

mail/base/content/searchBar.js

@@ -108,6 +108,7 @@ var gSearchNotificationListener =
         gStatusBar.setAttribute("mode","normal");
         gSearchInProgress = false;
         viewDebug("gSearchInput = " + gSearchInput.value + "\n");
+
         // ### TODO need to find out if there's quick search within a virtual folder.
         if (gCurrentVirtualFolderUri &&
          (gSearchInput.value == "" || gSearchInput.showingSearchCriteria))
@@ -587,6 +588,13 @@ function ClearQSIfNecessary()
   Search("");
 }
 
+// called after the user switches folders while inside
+// of a quick search view...
+function clearQuickSearchAfterFolderChange()
+{
+  gSearchInput.setSearchCriteriaText();
+}
+
 function Search(str)
 {
   viewDebug("in Search str = " + str + "gSearchInput.showingSearchCriteria = " + gSearchInput.showingSearchCriteria + "\n");