From a12f77eb72a0cb5bb1fffd7b17aa03ea2ccd80e2 Mon Sep 17 00:00:00 2001 From: "rpotts%netscape.com" Date: Mon, 22 Mar 1999 06:27:36 +0000 Subject: [PATCH] turned on the XPConnectFactory since it is now building on all platforms... git-svn-id: svn://10.0.0.236/trunk@24657 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/xpfe/appshell/src/nsAppShellFactory.cpp | 2 +- mozilla/xpfe/appshell/src/nsAppShellService.cpp | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/mozilla/xpfe/appshell/src/nsAppShellFactory.cpp b/mozilla/xpfe/appshell/src/nsAppShellFactory.cpp index 8ca7f81549f..917aa1529fa 100644 --- a/mozilla/xpfe/appshell/src/nsAppShellFactory.cpp +++ b/mozilla/xpfe/appshell/src/nsAppShellFactory.cpp @@ -96,11 +96,11 @@ NSGetFactory(nsISupports* serviceMgr, else if (aClass.Equals(kCmdLineServiceCID)) { rv = NS_NewCmdLineServiceFactory(aFactory); } -#if 0 else if (aClass.Equals(kXPConnectFactoryCID)) { rv = NS_NewXPConnectFactoryFactory(aFactory); } +#if 0 else if (aClass.Equals(kProtocolHelperCID)) { rv = NS_NewDefaultProtocolHelperFactory(aFactory); } diff --git a/mozilla/xpfe/appshell/src/nsAppShellService.cpp b/mozilla/xpfe/appshell/src/nsAppShellService.cpp index 4e54e8a6b27..ff78918ea5b 100644 --- a/mozilla/xpfe/appshell/src/nsAppShellService.cpp +++ b/mozilla/xpfe/appshell/src/nsAppShellService.cpp @@ -136,7 +136,6 @@ nsAppShellService::Initialize(void) rv = eventQService->CreateThreadEventQueue(); } -#if 0 // XXX: Remove this when mac and unix build the AppShellNameset... // Register the nsAppShellNameSet with the global nameset registry... nsIScriptNameSetRegistry *registry; rv = nsServiceManager::GetService(kCScriptNameSetRegistryCID, @@ -149,8 +148,7 @@ nsAppShellService::Initialize(void) nsAppShellNameSet* nameSet; nameSet = new nsAppShellNameSet(); registry->AddExternalNameSet(nameSet); - /* FIX - do we need to release this service? When we do, it get deleted,and our name is lost. */ -#endif + /* XXX: do we need to release this service? When we do, it get deleted,and our name is lost. */ // Create the toplevel window list... rv = NS_NewISupportsArray(&mWindowList);