this file should not have been checked in

This commit is contained in:
dougt%netscape.com 2002-05-31 21:05:57 +00:00
parent a81edfb475
commit 686bd64f44

View File

@ -1026,15 +1026,6 @@ nsDNSService::Init()
rv = InstallPrefObserver();
if (NS_FAILED(rv)) return rv;
// install xpcom shutdown observer
nsCOMPtr<nsIObserverService> observerService =
do_GetService("@mozilla.org/observer-service;1", &rv);
if (NS_FAILED(rv)) return rv;
rv = observerService->AddObserver(this, NS_XPCOM_SHUTDOWN_OBSERVER_ID, PR_FALSE);
if (NS_FAILED(rv)) return rv;
mState = DNS_ONLINE;
return NS_OK;
@ -1274,13 +1265,6 @@ nsDNSService::Observe(nsISupports * subject,
{
nsresult rv = NS_OK;
if (!nsCRT::strcmp(NS_XPCOM_SHUTDOWN_OBSERVER_ID, topic))
{
// we need to shutdown!
ShutdownInternal();
return NS_OK;
}
if (nsCRT::strcmp(NS_PREFBRANCH_PREFCHANGE_TOPIC_ID, topic))
return NS_OK;
@ -1318,6 +1302,7 @@ nsDNSService::Observe(nsISupports * subject,
mIDNConverter = nsnull;
}
}
return rv;
}
@ -1844,15 +1829,6 @@ nsDNSService::ShutdownInternal()
(void) RemovePrefObserver();
// remove xpcom shutdown observer
nsCOMPtr<nsIObserverService> observerService =
do_GetService("@mozilla.org/observer-service;1", &rv);
if (NS_FAILED(rv)) return rv;
rv = observerService->RemoveObserver(this, NS_XPCOM_SHUTDOWN_OBSERVER_ID);
if (NS_FAILED(rv)) return rv;
// reset hashtable
// XXX assert hashtable is empty
PL_DHashTableFinish(&mHashTable);