Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-14 18:51:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

turn on migration for the mac. note, it doesn't work just yet.

Browse Source
This commit is contained in:
sspitzer%netscape.com 1999-09-16 23:01:45 +00:00
parent 169aac8b82
commit a70ead5340
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
profile/src/nsProfile.cpp
View File

@ -541,11 +541,11 @@ nsProfile::ProcessArgs(nsICmdLineService *cmdLineArgs,
{
if (cmdResult) {
rv = MigrateProfileInfo();
//if (NS_FAILED(rv)) return rv;
if (NS_FAILED(rv)) return rv;
int num4xProfiles = 0;
rv = Get4xProfileCount(&num4xProfiles);
//if (NS_FAILED(rv)) return rv;
if (NS_FAILED(rv)) return rv;
int numProfiles = 0;
GetProfileCount(&numProfiles);
@ -2280,9 +2280,10 @@ NS_IMETHODIMP nsProfile::MigrateProfile(const char* profileName)
char *oldProfDirStr = nsnull;
char *newProfDirStr = nsnull;
rv = GetStringFromSpec(oldProfDir, &oldProfDirStr);
if (NS_SUCCEEDED(rv)) {
rv = GetStringFromSpec(newProfDir, &newProfDirStr);
rv = GetStringFromSpec(newProfDir, &newProfDirStr);
if (NS_SUCCEEDED(rv)) {
rv = GetStringFromSpec(oldProfDir, &oldProfDirStr);
if (NS_SUCCEEDED(rv)) {
rv = pPrefMigrator->ProcessPrefs(oldProfDirStr, newProfDirStr);
}
@ -2794,11 +2795,11 @@ NS_IMETHODIMP nsProfile::Get4xProfileCount(int *numProfiles)
// Migrates all unmigrated profiles
NS_IMETHODIMP nsProfile::MigrateAllProfiles()
{
nsresult rv = NS_OK;
for (int i=0; i < g_numOldProfiles; i++)
{
rv = MigrateProfile(gOldProfiles[i]);
if (NS_FAILED(rv)) return rv;
}
return NS_OK;