Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-27 04:38:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

necko - rearranged cookie service init order so it's after the profile init

Browse Source
This commit is contained in:
valeski%netscape.com 1999-07-19 22:49:24 +00:00
parent 2ec53e1f90
commit d42020a1ef
1 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
xpfe/bootstrap/nsAppRunner.cpp
View File

@ -171,6 +171,10 @@ int main(int argc, char* argv[])
nsIURI* url = nsnull;
nsIPref *prefs = nsnull;
#ifdef NECKO
nsICookieService *cookieService = nsnull;
#endif // NECKO
// initialization for Full Circle
#ifdef MOZ_FULLCIRCLE
{
@ -244,15 +248,6 @@ int main(int argc, char* argv[])
// XXX: This call will be replaced by a registry initialization...
NS_SetupRegistry_1();
#ifdef NECKO
// fire up an instance of the cookie manager.
// I'm doing this using the serviceManager for convenience's sake.
// Presumably an application will init it's own cookie service a
// different way (this way works too though).
NS_WITH_SERVICE(nsICookieService, cookieService, kCookieServiceCID, &rv);
if (NS_FAILED(rv)) goto done;
#endif // NECKO
// get and start the ProfileManager service
#if defined(NS_USING_PROFILES)
rv = nsServiceManager::GetService(kProfileCID,
@ -267,6 +262,17 @@ int main(int argc, char* argv[])
#endif // defined(NS_USING_PROFILES)
#ifdef NECKO
// fire up an instance of the cookie manager.
// I'm doing this using the serviceManager for convenience's sake.
// Presumably an application will init it's own cookie service a
// different way (this way works too though).
rv = nsServiceManager::GetService(kCookieServiceCID,
nsCOMTypeInfo<nsICookieService>::GetIID(),
(nsISupports **)&cookieService);
if (NS_FAILED(rv))
goto done;
#endif // NECKO
/*
* Start up the core services:
@ -724,6 +730,12 @@ done:
}
#endif
#ifdef NECKO
if (nsnull != cookieService)
nsServiceManager::ReleaseService(kCookieServiceCID, cookieService);
#endif // NECKO
/* Release the shell... */
if (nsnull != appShell) {
nsServiceManager::ReleaseService(kAppShellServiceCID, appShell);