Added GetRootFolder.

mailnews/base/util/nsMsgFolder.cpp

@@ -1319,6 +1319,26 @@ NS_IMETHODIMP nsMsgFolder::GetNewMessagesNotificationDescription(PRUnichar * *aD
 	return NS_OK;
 }
 
+NS_IMETHODIMP nsMsgFolder::GetRootFolder(nsIMsgFolder * *aRootFolder)
+{
+	if(!aRootFolder)
+		return NS_ERROR_NULL_POINTER;
+
+	nsresult rv;
+	nsCOMPtr<nsIMsgIncomingServer> server;
+	rv = GetServer(getter_AddRefs(server));
+	if(NS_FAILED(rv))
+		return rv;
+
+	nsCOMPtr<nsIFolder> aRoot;
+	rv = server->GetRootFolder(getter_AddRefs(aRoot));
+
+	if(NS_FAILED(rv) || !aRoot)
+		return rv;
+
+	return aRoot->QueryInterface(nsIMsgFolder::GetIID(), (void**)aRootFolder);
+}
+
 nsresult nsMsgFolder::NotifyPropertyChanged(char *property, char *oldValue, char* newValue)
 {
 	nsCOMPtr<nsISupports> supports;

mailnews/base/util/nsMsgFolder.h

@@ -259,7 +259,7 @@ public:
 
 	virtual nsresult GetDBFolderInfoAndDB(nsIDBFolderInfo **folderInfo, nsIMsgDatabase **db) = 0;
 	NS_IMETHOD DeleteMessages(nsISupportsArray *messages, 
-                            nsITransactionManager *txnMgr) = 0;
+                            nsITransactionManager *txnMgr, PRBool deleteStorage) = 0;
 	NS_IMETHOD GetNewMessages();
 
 	NS_IMETHOD GetCharset(PRUnichar * *aCharset) = 0;
@@ -273,6 +273,8 @@ public:
 
 	NS_IMETHOD GetNewMessagesNotificationDescription(PRUnichar * *adescription);
 
+	NS_IMETHOD GetRootFolder(nsIMsgFolder * *aRootFolder);
+
 protected:
 	nsresult NotifyPropertyChanged(char *property, char* oldValue, char* newValue);
 	nsresult NotifyPropertyFlagChanged(nsISupports *item, char *property, PRUint32 oldValue,

mailnews/base/util/nsMsgUtils.h

@@ -16,6 +16,9 @@
  * Reserved.
  */
 
+#ifndef _NSMSGUTILS_H
+#define _NSMSGUTILS_H
+
 #include "nsIMsgMessageService.h"
 #include "nsString.h"
 #include "nsIEnumerator.h"
@@ -60,3 +63,6 @@ NS_MSG_BASE nsresult NS_MsgGetPriorityFromString(const char *priority, nsMsgPrio
 NS_MSG_BASE nsresult NS_MsgGetUntranslatedPriorityName (nsMsgPriority p, nsString2 *outName);
 
 NS_MSG_BASE nsresult NS_MsgHashIfNecessary(nsString &name);
+
+#endif
+