Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-03-05 08:09:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

203077 - Rename Firefox profile data folder from Phoenix to Firefox.

Browse Source 
Make sure the migration FE does not show when the app is launched with -ProfileWizard or -CreateProfile, as these use cases do not imply automigration.
for full details see http://bugzilla.mozilla.org/show_bug.cgi?id=203077#c35
r=jst
This commit is contained in:
ben%bengoodger.com 2004-03-11 01:27:30 +00:00
parent 49b3b5e66e
commit 8fd81fe5ea
1 changed files with 31 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
xpfe/appshell/src/nsAppShellService.cpp
View File

@ -272,25 +272,42 @@ nsAppShellService::DoProfileStartup(nsICmdLineService *aCmdLineService, PRBool c
#ifdef MOZ_PHOENIX
// This will eventually change to MOZ_XULAPP
PRInt32 numProfiles = 0;
profileMgr->GetProfileCount(&numProfiles);
if (numProfiles == 0) {
nsCOMPtr<nsIProfileMigrator> pm(do_CreateInstance("@mozilla.org/profile/migrator;1", &rv));
if (NS_SUCCEEDED(rv)) {
nsCOMPtr<nsIObserver> obs(do_QueryInterface(pm));
// Profile Manager has a number of command line arguments... most of which relate to
// management UI or options for starting a specific profile. The migration code we're
// about to execute occurs ONLY in the situation when there are NO profiles.
//
// In this case there are only TWO profile manager flags that are of concern to us -
// -CreateProfile (used by various automation processes) and -ProfileWizard - these
// are the only two commands valid in the no-profile case - users of these commands
// do NOT want the automigration UI to appear, so we explicitly check for these flags
// before invoking anything.
nsXPIDLCString isCreateProfile, isCreateProfileWizard;
aCmdLineService->GetCmdLineValue("-CreateProfile", getter_Copies(isCreateProfile));
aCmdLineService->GetCmdLineValue("-ProfileWizard", getter_Copies(isCreateProfileWizard));
nsCOMPtr<nsIObserverService> os(do_GetService("@mozilla.org/observer-service;1"));
os->AddObserver(obs, "profile-initial-state", PR_FALSE);
rv = pm->Migrate();
}
if (NS_FAILED(rv)) {
// Migration failed for some reason, or there was no profile migrator.
// Create a generic default profile.
rv = profileMgr->CreateDefaultProfile();
if (isCreateProfile.IsEmpty() && isCreateProfileWizard.IsEmpty()) {
PRInt32 numProfiles = 0;
profileMgr->GetProfileCount(&numProfiles);
if (numProfiles == 0) {
nsCOMPtr<nsIProfileMigrator> pm(do_CreateInstance("@mozilla.org/profile/migrator;1", &rv));
if (NS_SUCCEEDED(rv)) {
nsCOMPtr<nsIObserver> obs(do_QueryInterface(pm));
nsCOMPtr<nsIObserverService> os(do_GetService("@mozilla.org/observer-service;1"));
os->AddObserver(obs, "profile-initial-state", PR_FALSE);
rv = pm->Migrate();
}
if (NS_FAILED(rv)) {
// Migration failed for some reason, or there was no profile migrator.
// Create a generic default profile.
rv = profileMgr->CreateDefaultProfile();
}
}
}
#endif
// If we are being launched in turbo mode, profile mgr cannot show UI
rv = profileMgr->StartupWithArgs(aCmdLineService, canInteract);
if (!canInteract && rv == NS_ERROR_PROFILE_REQUIRES_INTERACTION) {