fix some enum typos, remove some non-scriptable enums, and fix some non XPCOM-compliant accessors

mailnews/base/search/public/nsIMsgSearchValidityManager.idl

@@ -31,7 +31,7 @@ interface nsIMsgSearchValidityManager : nsISupports {
 
     // eventually it would be nice to use atoms or something
     const long onlineMail = 0;
-    const long offlineMailFilter = 1;
+    const long onlineMailFilter = 1;
     const long offlineMail = 2;
     const long localNews = 3;
     const long news = 4;

mailnews/base/search/public/nsMsgSearchAdapter.h

@@ -187,15 +187,6 @@ public:
   
 	nsresult PostProcessValidityTable (nsINNTPHost*);
 
-	enum {
-	  onlineMail,
-	  onlineMailFilter,
-	  offlineMail,
-	  localNews,
-	  news,
-	  newsEx
-	};
-
 protected:
 
 	// There's one global validity manager that everyone uses. You *could* do 

mailnews/base/search/src/nsMsgFilter.cpp

@@ -189,10 +189,10 @@ NS_IMETHODIMP nsMsgFilter::SetScope(nsIMsgSearchScopeTerm *aResult)
 
 NS_IMETHODIMP nsMsgFilter::GetScope(nsIMsgSearchScopeTerm **aResult)
 {
-	if (aResult == NULL)  
-        return NS_ERROR_NULL_POINTER;  
+    NS_ENSURE_ARG_POINTER(aResult);
 
 	*aResult = m_scope;
+    NS_IF_ADDREF(*aResult);
 	return NS_OK;
 }
 

mailnews/base/search/src/nsMsgFilter.h

@@ -92,7 +92,7 @@ protected:
 
 	nsMsgFilterList *m_filterList;	/* owning filter list */
     nsMsgSearchTermArray m_termList;       /* linked list of criteria terms */
-    nsIMsgSearchScopeTerm       *m_scope;         /* default for mail rules is inbox, but news rules could
+    nsCOMPtr<nsIMsgSearchScopeTerm> m_scope;         /* default for mail rules is inbox, but news rules could
 have a newsgroup - LDAP would be invalid */
 
 };