This commit is contained in:
dp%netscape.com 1999-08-31 07:36:02 +00:00
Родитель 34d12a0dec
Коммит cabd43268a
1 изменённых файлов: 174 добавлений и 183 удалений

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

@ -77,8 +77,8 @@ static NS_DEFINE_CID( kToolkitCoreCID, NS_TOOLKITCORE_CID );
#include "macstdlibextras.h"
#include <TextServices.h>
// Set up the toolbox and (if DEBUG) the console. Do this in a static initializer,
// to make it as unlikely as possible that somebody calls printf() before we get initialized.
// Set up the toolbox and (if DEBUG) the console. Do this in a static initializer,
// to make it as unlikely as possible that somebody calls printf() before we get initialized.
static struct MacInitializer { MacInitializer() { InitializeMacToolbox(); } } gInitializer;
@ -164,7 +164,7 @@ PrintUsage(void)
//----------------------------------------------------------------------------------------
static PRBool CheckAndRunPrefs(nsICmdLineService* cmdLineArgs)
//----------------------------------------------------------------------------------------
//----------------------------------------------------------------------------------------
{
// Support the "-pref" command-line option, which just puts up the pref window, so that
// apprunner becomes a "control panel". The "OK" and "Cancel" buttons will quit
@ -189,7 +189,7 @@ static PRBool CheckAndRunPrefs(nsICmdLineService* cmdLineArgs)
static void InitFullCircle()
{
// initialization for Full Circle
// initialization for Full Circle
#ifdef MOZ_FULLCIRCLE
FC_ERROR fcstatus = FC_ERROR_FAILED;
fcstatus = FCInitialize();
@ -327,9 +327,6 @@ static nsresult HandleMailStartup( nsICmdLineService* cmdLineArgs )
OpenChromURL("chrome://messenger/content/", height, width);
}
rv = cmdLineArgs->GetCmdLineValue("-compose", &cmdResult);
if (NS_SUCCEEDED(rv))
{
@ -346,8 +343,6 @@ static nsresult HandleMailStartup( nsICmdLineService* cmdLineArgs )
}
}
rv = cmdLineArgs->GetCmdLineValue("-addressbook", &cmdResult);
if (NS_SUCCEEDED(rv))
{
@ -399,7 +394,7 @@ nsresult nsPrefProfile::Startup( nsICmdLineService* cmdLineArgs )
char *profstr = nsnull;
int numProfiles = 0;
// get and start the ProfileManager service
// get and start the ProfileManager service
rv = nsServiceManager::GetService(kProfileCID,
nsIProfile::GetIID(),
@ -537,8 +532,6 @@ nsresult nsPrefProfile::Startup( nsICmdLineService* cmdLineArgs )
#endif // defined(NS_USING_PROFILES)
/*
* Load preferences, causing them to be initialized, and hold a reference to them.
*/
@ -549,8 +542,6 @@ nsresult nsPrefProfile::Startup( nsICmdLineService* cmdLineArgs )
return rv;
#if defined (NS_USING_PROFILES)
printf("Profile Manager : Profile Wizard and Manager activites : Begin\n");
/*
@ -754,9 +745,9 @@ static nsresult main1(int argc, char* argv[])
InitFullCircle();
#if XP_MAC
#if XP_MAC
stTSMCloser tsmCloser;
#endif
#endif
// XXX: This call will be replaced by a registry initialization...
NS_SetupRegistry_1();
@ -810,7 +801,7 @@ static nsresult main1(int argc, char* argv[])
// different way (this way works too though).
NS_WITH_SERVICE(nsICookieService, cookieService, kCookieServiceCID, &rv);
#ifndef XP_MAC
// Until the cookie manager actually exists on the Mac we don't want to bail here
// Until the cookie manager actually exists on the Mac we don't want to bail here
if (NS_FAILED(rv))
return rv;
#endif // XP_MAC
@ -864,14 +855,14 @@ int main(int argc, char* argv[])
// calling this explicitly will cut down on a large number of leaks we're
// seeing:
#if 0
#if 0
if ( unsigned long count = NS_TotalWebShellsInExistence() )
{
printf("!!!Warning: there are still %l instances of nsWebShell outstanding. OK?\n", count);
char cc;
scanf("%c", &cc);
}
#endif
#endif
rv = NS_ShutdownXPCOM( NULL );
NS_ASSERTION(NS_SUCCEEDED(rv), "NS_ShutdownXPCOM failed");