bug=58167
r=ashuk a=edburns This fix does two things: 1. Remove nsSetupRegistry.cpp from the build process. 2. Don't cal NS_AutoRegisterComponents, since it's doen in NS_InitEmbedding. git-svn-id: svn://10.0.0.236/branches/JAVADEV_PR3_20001002@81870 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
@@ -113,14 +113,6 @@ extern const char * gBinDir; // defined in WrapperFactoryImpl.cpp
|
||||
|
||||
#endif // XP_PC
|
||||
|
||||
//
|
||||
// Functions to hook into mozilla
|
||||
//
|
||||
|
||||
extern "C" void NS_SetupRegistry();
|
||||
extern nsresult NS_AutoregisterComponents();
|
||||
|
||||
|
||||
//
|
||||
// Local functions
|
||||
//
|
||||
@@ -455,7 +447,6 @@ void DoMozInitialization(WebShellInitContext * initContext)
|
||||
// It is vitally important to call NS_InitEmbedding before calling
|
||||
// anything else.
|
||||
NS_InitEmbedding(pathFile, nsnull);
|
||||
// NS_SetupRegistry();
|
||||
rv = NS_GetGlobalComponentManager(&gComponentManager);
|
||||
if (NS_FAILED(rv)) {
|
||||
::util_ThrowExceptionToJava(env, "NS_GetGlobalComponentManager() failed.");
|
||||
@@ -471,8 +462,6 @@ void DoMozInitialization(WebShellInitContext * initContext)
|
||||
gComponentManager->RegisterComponentLib(kSHistoryCID, nsnull,
|
||||
nsnull, APPSHELL_DLL,
|
||||
PR_FALSE, PR_FALSE);
|
||||
NS_AutoregisterComponents();
|
||||
|
||||
// handle the profile manager nonsense
|
||||
nsCOMPtr<nsICmdLineService> cmdLine =do_GetService(kCmdLineServiceCID);
|
||||
nsCOMPtr<nsIProfile> profile = do_GetService(NS_PROFILE_CONTRACTID);
|
||||
|
||||
Reference in New Issue
Block a user