removing additional instances of deprecated nsServiceManager:: methods, bug 219400

xpfe/components/search/src/nsLocalSearchService.cpp

@@ -96,9 +96,7 @@ LocalSearchDataSource::LocalSearchDataSource(void)
 {
 	if (gRefCnt++ == 0)
 	{
-		nsresult rv = nsServiceManager::GetService(kRDFServiceCID,
+		nsresult rv = CallGetService(kRDFServiceCID, &gRDFService);
-		                           NS_GET_IID(nsIRDFService),
-		                           (nsISupports**) &gRDFService);
 
 		PR_ASSERT(NS_SUCCEEDED(rv));
 
@@ -137,8 +135,7 @@ LocalSearchDataSource::~LocalSearchDataSource (void)
 		NS_RELEASE(kRDF_type);
 
 		gLocalSearchDataSource = nsnull;
-		nsServiceManager::ReleaseService(kRDFServiceCID, gRDFService);
+		NS_RELEASE(gRDFService);
-		gRDFService = nsnull;
 	}
 }