diff --git a/mailnews/base/src/nsMsgRDFDataSource.cpp b/mailnews/base/src/nsMsgRDFDataSource.cpp index 07f7b7d70a9f..426c439baa4c 100644 --- a/mailnews/base/src/nsMsgRDFDataSource.cpp +++ b/mailnews/base/src/nsMsgRDFDataSource.cpp @@ -438,30 +438,29 @@ nsMsgRDFDataSource::changeEnumFunc(nsISupports *aElement, void *aData) nsresult nsMsgRDFDataSource::GetTransactionManager(nsISupportsArray *aSources, nsITransactionManager **aTransactionManager) { - if(!aTransactionManager) - return NS_ERROR_NULL_POINTER; - - *aTransactionManager = nsnull; - nsresult rv = NS_OK; - - nsCOMPtr transactionManager; - - PRUint32 cnt; - - rv = aSources->Count(&cnt); - if (NS_FAILED(rv)) return rv; - - if (cnt > 0) - { - transactionManager = do_QueryElementAt(aSources, 0, &rv); - if (NS_SUCCEEDED(rv) && transactionManager) - { - aSources->RemoveElementAt(0); - *aTransactionManager = transactionManager; - NS_IF_ADDREF(*aTransactionManager); - } - } - - return NS_OK; + if(!aTransactionManager) + return NS_ERROR_NULL_POINTER; + + *aTransactionManager = nsnull; + nsresult rv = NS_OK; + + nsCOMPtr transactionManager; + + PRUint32 cnt; + + rv = aSources->Count(&cnt); + if (NS_FAILED(rv)) return rv; + + if (cnt > 0) + { + transactionManager = do_QueryElementAt(aSources, 0, &rv); + if (NS_SUCCEEDED(rv) && transactionManager) + { + aSources->RemoveElementAt(0); + NS_IF_ADDREF(*aTransactionManager = transactionManager); + } + } + + return NS_OK; } diff --git a/mailnews/base/src/nsMsgRDFDataSource.h b/mailnews/base/src/nsMsgRDFDataSource.h index 6645cb247511..4efefe43d4be 100644 --- a/mailnews/base/src/nsMsgRDFDataSource.h +++ b/mailnews/base/src/nsMsgRDFDataSource.h @@ -53,7 +53,7 @@ class nsMsgRDFDataSource : public nsIRDFDataSource, public nsIObserver, public nsSupportsWeakReference, - public nsIMsgRDFDataSource + public nsIMsgRDFDataSource { public: nsMsgRDFDataSource(); @@ -78,7 +78,7 @@ class nsMsgRDFDataSource : public nsIRDFDataSource, nsIRDFNode *newObject, nsIRDFNode *oldObject, PRBool assert, PRBool change); - nsresult NotifyPropertyChanged(nsIRDFResource *resource, + virtual nsresult NotifyPropertyChanged(nsIRDFResource *resource, nsIRDFResource *propertyResource, nsIRDFNode *newNode, nsIRDFNode *oldNode = nsnull); nsresult GetTransactionManager(nsISupportsArray *sources, nsITransactionManager **aTransactionManager);