Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Converting stray UnregisterFactory calls to UnregisterComponent

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@30485 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
dp%netscape.com
1999-05-06 01:37:04 +00:00
parent c0e86ca11b
commit f015deb427
30 changed files with 82 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mozilla/editor/base/nsEditor.cpp
View File

@@ -279,11 +279,11 @@ NSUnregisterSelf(nsISupports* aServMgr, const char *path)
(nsISupports**)&compMgr);
if (NS_FAILED(rv)) return rv;
rv = compMgr->UnregisterFactory(kIEditFactoryIID, path);
rv = compMgr->UnregisterComponent(kIEditFactoryIID, path);
if (NS_FAILED(rv)) goto done;
rv = compMgr->UnregisterFactory(kITextEditFactoryIID, path);
rv = compMgr->UnregisterComponent(kITextEditFactoryIID, path);
if (NS_FAILED(rv)) goto done;
rv = compMgr->UnregisterFactory(kIHTMLEditFactoryIID, path);
rv = compMgr->UnregisterComponent(kIHTMLEditFactoryIID, path);
done:
(void)servMgr->ReleaseService(kComponentManagerCID, compMgr);

2
mozilla/editor/guimgr/src/nsGuiManagerFactory.cpp
View File

@@ -158,7 +158,7 @@ extern "C" NS_EXPORT nsresult NSUnregisterSelf(nsISupports* aServMgr, const char
(nsISupports**)&compMgr);
if (NS_FAILED(rv)) return rv;
rv = nsComponentManager::UnregisterFactory(kIGuiManagerFactoryIID, path);
rv = nsComponentManager::UnregisterComponent(kIGuiManagerFactoryIID, path);
(void)servMgr->ReleaseService(kComponentManagerCID, compMgr);
return rv;

6
mozilla/editor/libeditor/base/nsEditor.cpp
View File

@@ -279,11 +279,11 @@ NSUnregisterSelf(nsISupports* aServMgr, const char *path)
(nsISupports**)&compMgr);
if (NS_FAILED(rv)) return rv;
rv = compMgr->UnregisterFactory(kIEditFactoryIID, path);
rv = compMgr->UnregisterComponent(kIEditFactoryIID, path);
if (NS_FAILED(rv)) goto done;
rv = compMgr->UnregisterFactory(kITextEditFactoryIID, path);
rv = compMgr->UnregisterComponent(kITextEditFactoryIID, path);
if (NS_FAILED(rv)) goto done;
rv = compMgr->UnregisterFactory(kIHTMLEditFactoryIID, path);
rv = compMgr->UnregisterComponent(kIHTMLEditFactoryIID, path);
done:
(void)servMgr->ReleaseService(kComponentManagerCID, compMgr);

2
mozilla/editor/libeditor/txtsvc/nsTextServicesFactory.cpp
View File

@@ -170,7 +170,7 @@ extern "C" NS_EXPORT nsresult NSUnregisterSelf(nsISupports* aServMgr, const char
(nsISupports**)&compMgr);
if (NS_FAILED(rv)) return rv;
rv = compMgr->UnregisterFactory(kCTextServicesDocumentCID, path);
rv = compMgr->UnregisterComponent(kCTextServicesDocumentCID, path);
(void)servMgr->ReleaseService(kComponentManagerCID, compMgr);
return rv;

2
mozilla/editor/txmgr/src/nsTransactionManagerFactory.cpp
View File

@@ -169,7 +169,7 @@ extern "C" NS_EXPORT nsresult NSUnregisterSelf(nsISupports* aServMgr, const char
(nsISupports**)&compMgr);
if (NS_FAILED(rv)) return rv;
rv = compMgr->UnregisterFactory(kCTransactionManagerCID, path);
rv = compMgr->UnregisterComponent(kCTransactionManagerCID, path);
(void)servMgr->ReleaseService(kComponentManagerCID, compMgr);
return rv;

2
mozilla/editor/txtsvc/src/nsTextServicesFactory.cpp
View File

@@ -170,7 +170,7 @@ extern "C" NS_EXPORT nsresult NSUnregisterSelf(nsISupports* aServMgr, const char
(nsISupports**)&compMgr);
if (NS_FAILED(rv)) return rv;
rv = compMgr->UnregisterFactory(kCTextServicesDocumentCID, path);
rv = compMgr->UnregisterComponent(kCTextServicesDocumentCID, path);
(void)servMgr->ReleaseService(kComponentManagerCID, compMgr);
return rv;

8
mozilla/intl/locale/src/mac/nsLocaleSHLIB.cpp
View File

@@ -186,16 +186,16 @@ extern "C" NS_EXPORT nsresult NSUnregisterSelf(nsISupports* aServMgr, const char
(nsISupports**)&compMgr);
if (NS_FAILED(rv)) return rv;
rv = compMgr->UnregisterFactory(kLocaleFactoryCID, path);
rv = compMgr->UnregisterComponent(kLocaleFactoryCID, path);
if (NS_FAILED(rv)) goto done;
rv = compMgr->UnregisterFactory(kCollationFactoryCID, path);
rv = compMgr->UnregisterComponent(kCollationFactoryCID, path);
if (NS_FAILED(rv)) goto done;
rv = compMgr->UnregisterFactory(kCollationCID, path);
rv = compMgr->UnregisterComponent(kCollationCID, path);
if (NS_FAILED(rv)) goto done;
rv = compMgr->UnregisterFactory(kDateTimeFormatCID, path);
rv = compMgr->UnregisterComponent(kDateTimeFormatCID, path);
if (NS_FAILED(rv)) goto done;
done:

10
mozilla/intl/locale/src/unix/nsLocaleSO.cpp
View File

@@ -192,19 +192,19 @@ extern "C" NS_EXPORT nsresult NSUnregisterSelf(nsISupports* aServMgr, const char
(nsISupports**)&compMgr);
if (NS_FAILED(rv)) return rv;
rv = compMgr->UnregisterFactory(kLocaleFactoryCID, path);
rv = compMgr->UnregisterComponent(kLocaleFactoryCID, path);
if (NS_FAILED(rv)) goto done;
rv = compMgr->UnregisterFactory(kPosixLocaleFactoryCID,path);
rv = compMgr->UnregisterComponent(kPosixLocaleFactoryCID,path);
if (NS_FAILED(rv)) goto done;
rv = compMgr->UnregisterFactory(kCollationFactoryCID, path);
rv = compMgr->UnregisterComponent(kCollationFactoryCID, path);
if (NS_FAILED(rv)) goto done;
rv = compMgr->UnregisterFactory(kCollationCID, path);
rv = compMgr->UnregisterComponent(kCollationCID, path);
if (NS_FAILED(rv)) goto done;
rv = compMgr->UnregisterFactory(kDateTimeFormatCID, path);
rv = compMgr->UnregisterComponent(kDateTimeFormatCID, path);
if (NS_FAILED(rv)) goto done;
done:

12
mozilla/intl/locale/src/windows/nsLocaleDLL.cpp
View File

@@ -201,19 +201,19 @@ extern "C" NS_EXPORT nsresult NSUnregisterSelf(nsISupports* aServMgr, const char
(nsISupports**)&compMgr);
if (NS_FAILED(rv)) return rv;
rv = compMgr->UnregisterFactory(kLocaleFactoryCID, path);
rv = compMgr->UnregisterComponent(kLocaleFactoryCID, path);
if (NS_FAILED(rv)) goto done;
rv = compMgr->UnregisterFactory(kWin32LocaleFactoryCID, path);
rv = compMgr->UnregisterComponent(kWin32LocaleFactoryCID, path);
if (NS_FAILED(rv)) goto done;
rv = compMgr->UnregisterFactory(kCollationFactoryCID, path);
rv = compMgr->UnregisterComponent(kCollationFactoryCID, path);
if (NS_FAILED(rv)) goto done;
rv = compMgr->UnregisterFactory(kCollationCID, path);
rv = compMgr->UnregisterComponent(kCollationCID, path);
if (NS_FAILED(rv)) goto done;
rv = compMgr->UnregisterFactory(kDateTimeFormatCID, path);
rv = compMgr->UnregisterComponent(kDateTimeFormatCID, path);
if (NS_FAILED(rv)) goto done;
done:
@@ -221,4 +221,4 @@ extern "C" NS_EXPORT nsresult NSUnregisterSelf(nsISupports* aServMgr, const char
return rv;
}
#endif
#endif

2
mozilla/intl/lwbrk/src/nsLWBrk.cpp
View File

@@ -141,7 +141,7 @@ extern "C" NS_EXPORT nsresult NSUnregisterSelf(nsISupports* aServMgr, const char
(nsISupports**)&compMgr);
if (NS_FAILED(rv)) return rv;
rv = compMgr->UnregisterFactory(kLWBrkCID, path);
rv = compMgr->UnregisterComponent(kLWBrkCID, path);
(void)servMgr->ReleaseService(kComponentManagerCID, compMgr);
return rv;

2
mozilla/intl/strres/src/nsStringBundle.cpp
View File

@@ -254,7 +254,7 @@ NSUnregisterSelf(nsISupports* aServMgr, const char* path)
(nsISupports**)&compMgr);
if (NS_FAILED(rv)) return rv;
rv = compMgr->UnregisterFactory(kStringBundleServiceCID, path);
rv = compMgr->UnregisterComponent(kStringBundleServiceCID, path);
if (NS_FAILED(rv)) goto done;
done:

10
mozilla/intl/uconv/src/nsUConvDll.cpp
View File

@@ -171,19 +171,19 @@ extern "C" NS_EXPORT nsresult NSUnregisterSelf(nsISupports* aServMgr, const char
(nsISupports**)&compMgr);
if (NS_FAILED(rv)) return rv;
rv = compMgr->UnregisterFactory(kUnicodeDecodeHelperCID, path);
rv = compMgr->UnregisterComponent(kUnicodeDecodeHelperCID, path);
if(NS_FAILED(rv)) goto done;
rv = compMgr->UnregisterFactory(kUnicodeEncodeHelperCID, path);
rv = compMgr->UnregisterComponent(kUnicodeEncodeHelperCID, path);
if(NS_FAILED(rv)) goto done;
rv = compMgr->UnregisterFactory(kCharsetAliasCID, path);
rv = compMgr->UnregisterComponent(kCharsetAliasCID, path);
if(NS_FAILED(rv)) goto done;
rv = compMgr->UnregisterFactory(kCharsetConverterManagerCID, path);
rv = compMgr->UnregisterComponent(kCharsetConverterManagerCID, path);
if(NS_FAILED(rv)) goto done;
rv = compMgr->UnregisterFactory(kPlatformCharsetCID, path);
rv = compMgr->UnregisterComponent(kPlatformCharsetCID, path);
done:
(void)servMgr->ReleaseService(kComponentManagerCID, compMgr);

2
mozilla/intl/uconv/ucvcn/nsUCvCnDll.cpp
View File

@@ -239,7 +239,7 @@ extern "C" NS_EXPORT nsresult NSUnregisterSelf(nsISupports* aServMgr, const char
if (NS_FAILED(rv)) return rv;
for (PRUint32 i=0; i<ARRAY_SIZE(g_FactoryData); i++) {
rv = compMgr->UnregisterFactory(*(g_FactoryData[i].mCID), path);
rv = compMgr->UnregisterComponent(*(g_FactoryData[i].mCID), path);
if(NS_FAILED(rv)) goto done;
}

2
mozilla/intl/uconv/ucvja/nsUCVJADll.cpp
View File

@@ -196,7 +196,7 @@ extern "C" NS_EXPORT nsresult NSUnregisterSelf(nsISupports* aServMgr, const char
if (NS_FAILED(rv)) return rv;
for (PRUint32 i=0; i<ARRAY_SIZE(g_FactoryData); i++) {
rv = compMgr->UnregisterFactory(*(g_FactoryData[i].mCID), path);
rv = compMgr->UnregisterComponent(*(g_FactoryData[i].mCID), path);
if(NS_FAILED(rv)) goto done;
}

2
mozilla/intl/uconv/ucvja2/nsUCVJA2Dll.cpp
View File

@@ -234,7 +234,7 @@ extern "C" NS_EXPORT nsresult NSUnregisterSelf(nsISupports* aServMgr, const char
if (NS_FAILED(rv)) return rv;
for (PRUint32 i=0; i<ARRAY_SIZE(g_FactoryData); i++) {
rv = compMgr->UnregisterFactory(*(g_FactoryData[i].mCID), path);
rv = compMgr->UnregisterComponent(*(g_FactoryData[i].mCID), path);
if(NS_FAILED(rv)) goto done;
}

2
mozilla/intl/uconv/ucvlatin/nsUCvLatinDll.cpp
View File

@@ -673,7 +673,7 @@ extern "C" NS_EXPORT nsresult NSUnregisterSelf(nsISupports* aServMgr, const char
if (NS_FAILED(rv)) return rv;
for (PRUint32 i=0; i<ARRAY_SIZE(g_FactoryData); i++) {
rv = compMgr->UnregisterFactory(*(g_FactoryData[i].mCID), path);
rv = compMgr->UnregisterComponent(*(g_FactoryData[i].mCID), path);
if(NS_FAILED(rv)) goto done;
}

2
mozilla/intl/unicharutil/src/nsUnicharUtilFactory.cpp
View File

@@ -142,7 +142,7 @@ extern "C" NS_EXPORT nsresult NSUnregisterSelf(nsISupports* aServMgr, const char
(nsISupports**)&compMgr);
if (NS_FAILED(rv)) return rv;
rv = compMgr->UnregisterFactory(kUnicharUtilCID, path);
rv = compMgr->UnregisterComponent(kUnicharUtilCID, path);
(void)servMgr->ReleaseService(kComponentManagerCID, compMgr);
return rv;

6
mozilla/mailnews/db/msgdb/build/nsMsgDBFactory.cpp
View File

@@ -216,13 +216,13 @@ NSUnregisterSelf(nsISupports* aServMgr, const char* path)
(nsISupports**)&compMgr);
if (NS_FAILED(rv)) return rv;
rv = compMgr->UnregisterFactory(kCMailDB, path);
rv = compMgr->UnregisterComponent(kCMailDB, path);
if (NS_FAILED(rv)) goto done;
rv = compMgr->UnregisterFactory(kCImapDB, path);
rv = compMgr->UnregisterComponent(kCImapDB, path);
if (NS_FAILED(rv)) goto done;
rv = compMgr->UnregisterFactory(kCNewsDB, path);
rv = compMgr->UnregisterComponent(kCNewsDB, path);
if (NS_FAILED(rv)) goto done;
done:

12
mozilla/mailnews/imap/build/nsImapFactory.cpp
View File

@@ -272,25 +272,25 @@ NSUnregisterSelf(nsISupports* aServMgr, const char* path)
(nsISupports**)&compMgr);
if (NS_FAILED(rv)) return rv;
rv = compMgr->UnregisterFactory(kCImapUrl, path);
rv = compMgr->UnregisterComponent(kCImapUrl, path);
if (NS_FAILED(rv)) goto done;
rv = compMgr->UnregisterFactory(kCImapProtocol, path);
rv = compMgr->UnregisterComponent(kCImapProtocol, path);
if (NS_FAILED(rv)) goto done;
rv = compMgr->UnregisterFactory(kCImapHostSessionList, path);
rv = compMgr->UnregisterComponent(kCImapHostSessionList, path);
if (NS_FAILED(rv)) goto done;
rv = compMgr->UnregisterFactory(kCImapIncomingServer, path);
rv = compMgr->UnregisterComponent(kCImapIncomingServer, path);
if (NS_FAILED(rv)) goto done;
rv = compMgr->UnregisterFactory(kCImapService, path);
rv = compMgr->UnregisterComponent(kCImapService, path);
if (NS_FAILED(rv)) goto done;
rv = compMgr->UnregisterComponent(kCImapMessageResource, path);
if (NS_FAILED(rv)) goto done;
rv = compMgr->UnregisterFactory(kCImapResource, path);
rv = compMgr->UnregisterComponent(kCImapResource, path);
if (NS_FAILED(rv)) goto done;
done:

10
mozilla/mailnews/local/build/nsMsgLocalFactory.cpp
View File

@@ -326,19 +326,19 @@ NSUnregisterSelf(nsISupports* aServMgr, const char* path)
(nsISupports**)&compMgr);
if (NS_FAILED(rv)) return rv;
rv = compMgr->UnregisterFactory(kMailboxUrlCID, path);
rv = compMgr->UnregisterComponent(kMailboxUrlCID, path);
if (NS_FAILED(rv)) goto done;
rv = compMgr->UnregisterFactory(kMailboxServiceCID, path);
rv = compMgr->UnregisterComponent(kMailboxServiceCID, path);
if (NS_FAILED(rv)) goto done;
rv = compMgr->UnregisterFactory(kPop3UrlCID, path);
rv = compMgr->UnregisterComponent(kPop3UrlCID, path);
if (NS_FAILED(rv)) goto done;
rv = compMgr->UnregisterFactory(kPop3ServiceCID, path);
rv = compMgr->UnregisterComponent(kPop3ServiceCID, path);
if (NS_FAILED(rv)) goto done;
rv = compMgr->UnregisterFactory(kMailboxParserCID, path);
rv = compMgr->UnregisterComponent(kMailboxParserCID, path);
if (NS_FAILED(rv)) goto done;
rv = compMgr->UnregisterComponent(kLocalMailFolderResourceCID, path);

2
mozilla/modules/libimg/gifcom/nsGIFDecoder.cpp
View File

@@ -183,7 +183,7 @@ extern "C" NS_EXPORT nsresult NSUnregisterSelf(nsISupports* aServMgr, const char
(nsISupports**)&compMgr);
if (NS_FAILED(rv)) return rv;
rv = compMgr->UnregisterFactory(kGIFDecoderCID, path);
rv = compMgr->UnregisterComponent(kGIFDecoderCID, path);
(void)servMgr->ReleaseService(kComponentManagerCID, compMgr);
return rv;

2
mozilla/modules/libimg/jpgcom/nsJPGDecoder.cpp
View File

@@ -145,7 +145,7 @@ extern "C" NS_EXPORT nsresult NSUnregisterSelf(nsISupports* aServMgr, const char
(nsISupports**)&compMgr);
if (NS_FAILED(rv)) return rv;
rv = compMgr->UnregisterFactory(kJPGDecoderCID, path);
rv = compMgr->UnregisterComponent(kJPGDecoderCID, path);
(void)servMgr->ReleaseService(kComponentManagerCID, compMgr);
return rv;

2
mozilla/modules/libimg/pngcom/nsPNGDecoder.cpp
View File

@@ -185,7 +185,7 @@ extern "C" NS_EXPORT nsresult NSUnregisterSelf(nsISupports* aServMgr, const char
(nsISupports**)&compMgr);
if (NS_FAILED(rv)) return rv;
rv = compMgr->UnregisterFactory(kPNGDecoderCID, path);
rv = compMgr->UnregisterComponent(kPNGDecoderCID, path);
(void)servMgr->ReleaseService(kComponentManagerCID, compMgr);
return rv;

2
mozilla/modules/libpref/src/nsPref.cpp
View File

@@ -1027,7 +1027,7 @@ extern "C" NS_EXPORT nsresult NSUnregisterSelf(nsISupports* aServMgr, const char
if (NS_FAILED(rv))
return rv;
rv = compMgr->UnregisterFactory(kPrefCID, path);
rv = compMgr->UnregisterComponent(kPrefCID, path);
(void)servMgr->ReleaseService(kComponentManagerCID, compMgr);
return rv;

2
mozilla/profile/src/nsProfile.cpp
View File

@@ -756,7 +756,7 @@ extern "C" NS_EXPORT nsresult NSUnregisterSelf(nsISupports* aServMgr, const char
(nsISupports**)&compMgr);
if (NS_FAILED(rv)) return rv;
rv = compMgr->UnregisterFactory(kProfileCID, path);
rv = compMgr->UnregisterComponent(kProfileCID, path);
(void)servMgr->ReleaseService(kComponentManagerCID, compMgr);
return rv;

44
mozilla/silentdl/nsSilentDownload.cpp
View File

@@ -1032,25 +1032,9 @@ nsSilentDownloadManagerFactory::QueryInterface(REFNSIID aIID,void** aInstancePtr
}
NS_IMPL_ADDREF(nsSilentDownloadManagerFactory)
NS_IMPL_RELEASE(nsSilentDownloadManagerFactory)
NS_IMETHODIMP
nsSilentDownloadManagerFactory::AddRef(void)
{
return ++mRefCnt;
}
NS_IMETHODIMP
nsSilentDownloadManagerFactory::Release(void)
{
if (--mRefCnt ==0)
{
delete this;
return 0; // Don't access mRefCnt after deleting!
}
return mRefCnt;
}
NS_IMETHODIMP
nsSilentDownloadManagerFactory::CreateInstance(nsISupports *aOuter, REFNSIID aIID, void **aResult)
@@ -1134,25 +1118,9 @@ nsSilentDownloadTaskFactory::QueryInterface(REFNSIID aIID,void** aInstancePtr)
}
NS_IMPL_ADDREF(nsSilentDownloadTaskFactory)
NS_IMPL_RELEASE(nsSilentDownloadTaskFactory)
NS_IMETHODIMP
nsSilentDownloadTaskFactory::AddRef(void)
{
return ++mRefCnt;
}
NS_IMETHODIMP
nsSilentDownloadTaskFactory::Release(void)
{
if (--mRefCnt ==0)
{
delete this;
return 0; // Don't access mRefCnt after deleting!
}
return mRefCnt;
}
NS_IMETHODIMP
nsSilentDownloadTaskFactory::CreateInstance(nsISupports *aOuter, REFNSIID aIID, void **aResult)
@@ -1483,9 +1451,9 @@ NSUnregisterSelf(nsISupports* aServMgr, const char *path)
printf("*** SilentDownload is being unregistered\n");
#endif
rv = compMgr->UnregisterFactory(kSilentDownloadCID, path);
rv = compMgr->UnregisterComponent(kSilentDownloadCID, path);
if (NS_FAILED(rv)) goto done;
rv = compMgr->UnregisterFactory(kSilentDownloadTaskCID, path);
rv = compMgr->UnregisterComponent(kSilentDownloadTaskCID, path);
done:
(void)servMgr->ReleaseService(kComponentManagerCID, compMgr);

2
mozilla/xpcom/tests/dynamic/TestDynamic.cpp
View File

@@ -167,7 +167,7 @@ extern "C" NS_EXPORT nsresult NSUnregisterSelf(nsISupports* aServMgr, const char
(nsISupports**)&compMgr);
if (NS_FAILED(rv)) return rv;
rv = compMgr->UnregisterFactory(kTestLoadedFactoryCID, path);
rv = compMgr->UnregisterComponent(kTestLoadedFactoryCID, path);
(void)servMgr->ReleaseService(kComponentManagerCID, compMgr);
return rv;

18
mozilla/xpfe/AppCores/src/nsAppCores.cpp
View File

@@ -80,15 +80,15 @@ NSUnregisterSelf(nsISupports* serviceMgr, const char *path)
{
printf("*** AppCores object is being unregistered\n");
nsComponentManager::UnregisterFactory(kAppCoresManagerCID, path);
nsComponentManager::UnregisterFactory(kDOMPropsCoreCID, path);
nsComponentManager::UnregisterFactory(kPrefsCoreCID, path);
nsComponentManager::UnregisterFactory(kProfileCoreCID, path);
nsComponentManager::UnregisterFactory(kRDFCoreCID, path);
nsComponentManager::UnregisterFactory(kToolbarCoreCID, path);
nsComponentManager::UnregisterFactory(kToolkitCoreCID, path);
nsComponentManager::UnregisterFactory(kBrowserAppCoreCID, path);
nsComponentManager::UnregisterFactory(kEditorAppCoreCID, path);
nsComponentManager::UnregisterComponent(kAppCoresManagerCID, path);
nsComponentManager::UnregisterComponent(kDOMPropsCoreCID, path);
nsComponentManager::UnregisterComponent(kPrefsCoreCID, path);
nsComponentManager::UnregisterComponent(kProfileCoreCID, path);
nsComponentManager::UnregisterComponent(kRDFCoreCID, path);
nsComponentManager::UnregisterComponent(kToolbarCoreCID, path);
nsComponentManager::UnregisterComponent(kToolkitCoreCID, path);
nsComponentManager::UnregisterComponent(kBrowserAppCoreCID, path);
nsComponentManager::UnregisterComponent(kEditorAppCoreCID, path);
return NS_OK;
}

14
mozilla/xpfe/appshell/src/nsAppShellFactory.cpp
View File

@@ -65,13 +65,13 @@ NSRegisterSelf(nsISupports* serviceMgr, const char *path)
extern "C" NS_EXPORT nsresult
NSUnregisterSelf(nsISupports* serviceMgr, const char *path)
{
nsComponentManager::UnregisterFactory(kAppShellServiceCID, path);
nsComponentManager::UnregisterFactory(kCmdLineServiceCID, path);
nsComponentManager::UnregisterFactory(kFileLocatorCID, path);
nsComponentManager::UnregisterFactory(kProtocolHelperCID, path);
nsComponentManager::UnregisterFactory(kXPConnectFactoryCID, path);
nsComponentManager::UnregisterFactory(kGlobalHistoryCID, path);
nsComponentManager::UnregisterFactory(kNetSupportDialogCID, path);
nsComponentManager::UnregisterComponent(kAppShellServiceCID, path);
nsComponentManager::UnregisterComponent(kCmdLineServiceCID, path);
nsComponentManager::UnregisterComponent(kFileLocatorCID, path);
nsComponentManager::UnregisterComponent(kProtocolHelperCID, path);
nsComponentManager::UnregisterComponent(kXPConnectFactoryCID, path);
nsComponentManager::UnregisterComponent(kGlobalHistoryCID, path);
nsComponentManager::UnregisterComponent(kNetSupportDialogCID, path);
return NS_OK;
}

6
mozilla/xpinstall/src/nsSoftwareUpdate.cpp
View File

@@ -395,9 +395,9 @@ NSUnregisterSelf(nsISupports* serviceMgr, const char *path)
{
printf("*** XPInstall is being unregistered\n");
nsRepository::UnregisterFactory(kSoftwareUpdate_CID, path);
nsRepository::UnregisterFactory(kInstallTrigger_CID, path);
nsRepository::UnregisterFactory(kInstallVersion_CID, path);
nsRepository::UnregisterComponent(kSoftwareUpdate_CID, path);
nsRepository::UnregisterComponent(kInstallTrigger_CID, path);
nsRepository::UnregisterComponent(kInstallVersion_CID, path);
return NS_OK;
}