From 0c2d25bba5b596ee363a54bc836fbf1e30e21996 Mon Sep 17 00:00:00 2001 From: "mscott%netscape.com" Date: Fri, 4 Jun 1999 23:42:18 +0000 Subject: [PATCH] Bug #5633 -- use NS_WITH_SERVICE macro. git-svn-id: svn://10.0.0.236/trunk@33860 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/mailnews/base/src/nsMessenger.cpp | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/mozilla/mailnews/base/src/nsMessenger.cpp b/mozilla/mailnews/base/src/nsMessenger.cpp index 58458d48aad..87c47a91930 100644 --- a/mozilla/mailnews/base/src/nsMessenger.cpp +++ b/mozilla/mailnews/base/src/nsMessenger.cpp @@ -172,17 +172,14 @@ static nsresult AddView(nsIRDFCompositeDataSource *database, nsIMessageView **me if(!messageView || !database) return NS_ERROR_NULL_POINTER; - nsIRDFService* gRDFService = nsnull; nsIRDFDataSource *view, *datasource; nsresult rv; - rv = nsServiceManager::GetService(kRDFServiceCID, - nsIRDFService::GetIID(), - (nsISupports**) &gRDFService); + NS_WITH_SERVICE(nsIRDFService, gRDFService, kRDFServiceCID, &rv); + if(NS_SUCCEEDED(rv)) { rv = gRDFService->GetDataSource("rdf:mail-messageview", &view); rv = NS_SUCCEEDED(rv) && gRDFService->GetDataSource("rdf:mailnewsfolders", &datasource); - nsServiceManager::ReleaseService(kRDFServiceCID, gRDFService); } if(!NS_SUCCEEDED(rv)) @@ -209,8 +206,6 @@ static nsresult AddView(nsIRDFCompositeDataSource *database, nsIMessageView **me NS_IF_RELEASE(datasource); return rv; - - } //