missed a few changes in my nsIObserver landing

This commit is contained in:
dougt%netscape.com 2001-10-19 22:30:02 +00:00
Родитель 9772fcd8c9
Коммит 267e6553c4
1 изменённых файлов: 2 добавлений и 3 удалений

Просмотреть файл

@ -708,7 +708,7 @@ static PRBool gInitialized = PR_FALSE;
// XPCOM shutdown observer // XPCOM shutdown observer
NS_IMETHODIMP NS_IMETHODIMP
nsGlyphTableList::Observe(nsISupports* aSubject, nsGlyphTableList::Observe(nsISupports* aSubject,
const PRUnichar* aTopic, const char* aTopic,
const PRUnichar* someData) const PRUnichar* someData)
{ {
Finalize(); Finalize();
@ -739,8 +739,7 @@ nsGlyphTableList::Finalize()
nsCOMPtr<nsIObserverService> obs = nsCOMPtr<nsIObserverService> obs =
do_GetService(NS_OBSERVERSERVICE_CONTRACTID, &rv); do_GetService(NS_OBSERVERSERVICE_CONTRACTID, &rv);
if (NS_SUCCEEDED(rv)) { if (NS_SUCCEEDED(rv)) {
nsAutoString topic; topic.AssignWithConversion(NS_XPCOM_SHUTDOWN_OBSERVER_ID); rv = obs->RemoveObserver(this, NS_XPCOM_SHUTDOWN_OBSERVER_ID);
rv = obs->RemoveObserver(this, topic.get());
} }
// delete the glyph tables // delete the glyph tables
for (PRInt32 i = 0; i < Count(); i++) { for (PRInt32 i = 0; i < Count(); i++) {