Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add pref to auto migrate all profiles, r/a=sspitzer, sr=mscott 226146

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@149552 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
bienvenu%nventure.com
2003-11-19 18:42:27 +00:00
parent df6396c712
commit d4472ee376
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mozilla/profile/src/nsProfile.cpp
View File

@@ -121,6 +121,7 @@
#define PREF_CONFIRM_AUTOMIGRATION "profile.confirm_automigration"
#define PREF_AUTOMIGRATION "profile.allow_automigration"
#define PREF_MIGRATE_ALL "profile.migrate_all"
#if defined (XP_MAC)
#define CHROME_STYLE nsIWebBrowserChrome::CHROME_WINDOW_BORDERS | nsIWebBrowserChrome::CHROME_WINDOW_CLOSE | nsIWebBrowserChrome::CHROME_CENTER_SCREEN
@@ -905,6 +906,9 @@ nsProfile::ProcessArgs(nsICmdLineService *cmdLineArgs,
if (allowAutoMigration && (NS_SUCCEEDED(rv) || forceMigration))
{
if (cmdResult || forceMigration) {
PRBool migrateAll = PR_FALSE;
(void)prefBranch->GetBoolPref(PREF_MIGRATE_ALL, &migrateAll);
rv = MigrateProfileInfo();
if (NS_FAILED(rv)) return rv;
@@ -922,7 +926,7 @@ nsProfile::ProcessArgs(nsICmdLineService *cmdLineArgs,
else if (num4xProfiles == 0 && numProfiles == 1) {
profileURLStr = "";
}
else if (num4xProfiles == 1 && numProfiles == 0) {
else if ((num4xProfiles == 1 || migrateAll) && numProfiles == 0) {
PRBool confirmed = PR_FALSE;
if (NS_SUCCEEDED(ConfirmAutoMigration(canInteract, &confirmed)) && confirmed)
AutoMigrate();