fix for regression bug #202584 (in mail views, you should only see is/isn't for junk, has attachment and label)

fix for bug #202848, when switching between pop and imap searches, it's possible to get an empty operator menulist.

r/sr=bienvenu

mailnews/base/resources/content/mailWidgets.xml

@@ -625,10 +625,6 @@
       <property name="valueIds" readonly="true">
         <getter>
           <![CDATA[
-            var attrs_length = new Object;
-            var attrs = this.validityTable.getAvailableAttributes(attrs_length);
-            if (!(this.searchAttribute in attrs))
-              this.searchAttribute = Components.interfaces.nsMsgSearchAttrib.Default;    
             var length = new Object;
             return this.validityTable.getAvailableOperators(this.searchAttribute,length);
           ]]>

mailnews/base/search/resources/content/searchTermOverlay.js

@@ -250,6 +250,8 @@ function setSearchScope(scope)
     for (var i=0; i<gSearchTerms.length; i++) {
         gSearchTerms[i].obj.searchattribute.searchScope = scope;
         gSearchTerms[i].scope = scope;
+        // act like the user "selected" this, see bug #202848
+        gSearchTerms[i].obj.searchattribute.onSelect(null /* no event */);  
     }
 }