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

conflict with profile checkin

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@35407 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
mcmullen%netscape.com 1999-06-15 06:42:23 +00:00
parent 88283344c4
commit 2f50472c00
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1906,15 +1906,12 @@ NS_IMETHODIMP nsProfile::MigrateProfile(const char* profileName)
}
// Get current profile, make the new one a sibling...
rv = locator->GetFileLocation(nsSpecialFileSpec::App_UserProfileDirectory50, &newProfDir);
if (NS_FAILED(rv))
{
nsIFileSpec* newSpec = NS_LocateFileOrDirectory(
nsSpecialFileSpec::App_UserProfileDirectory50);
if (!newSpec)
return NS_ERROR_FAILURE;
}
nsServiceManager::ReleaseService(kFileLocatorCID, locator);
newSpec->GetFileSpec(&newProfDir);
NS_RELEASE(newSpec);
newProfDir.SetLeafName(profileName);