Bug #5633 -- use NS_WITH_SERVICE macro.

git-svn-id: svn://10.0.0.236/trunk@33860 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
mscott%netscape.com
1999-06-04 23:42:18 +00:00
parent c4bf59ddf0
commit 0c2d25bba5

View File

@@ -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;
}
//