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

Bullet-proofing for bug #5576 (make sure profile directory is always initialized)

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@29974 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
mcmullen%netscape.com 1999-05-03 20:27:44 +00:00
parent b095432a67
commit a8403fe8d7
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
mozilla/xpfe/appshell/src/nsFileLocations.cpp
View File

@ -117,7 +117,7 @@ static void GetProfileDirectory(nsFileSpec& outSpec)
{
// First time, initialize gProfileDir
nsIProfile *profileService = nsnull;
gProfileDir = new nsFileSpec;
gProfileDir = new nsFileSpec("Default");
if (!gProfileDir)
return;
nsresult rv = nsServiceManager::GetService(
@ -128,6 +128,7 @@ static void GetProfileDirectory(nsFileSpec& outSpec)
{
char* currProfileName = nsnull;
nsFileSpec currProfileDirSpec;
CreateDefaultProfileDirectorySpec(currProfileDirSpec);
profileService->Startup(nsnull);
int numProfiles = 0;
@ -135,7 +136,6 @@ static void GetProfileDirectory(nsFileSpec& outSpec)
if (numProfiles == 0)
{
// no profiles exist: create "default" profile
CreateDefaultProfileDirectorySpec(currProfileDirSpec);
profileService->SetProfileDir("default", currProfileDirSpec);
currProfileName = PL_strdup("default");
}
@ -236,31 +236,31 @@ void nsSpecialFileSpec::operator = (Type aType)
case App_ComponentsDirectory:
{
nsSpecialSystemDirectory dir(nsSpecialSystemDirectory::OS_CurrentProcessDirectory);
*this = nsSpecialSystemDirectory(nsSpecialSystemDirectory::OS_CurrentProcessDirectory);
#ifdef XP_MAC
dir += "Components";
*this += "Components";
#else
dir += "components";
*this += "components";
#endif
}
break;
case App_ChromeDirectory:
{
nsSpecialSystemDirectory dir(nsSpecialSystemDirectory::OS_CurrentProcessDirectory);
*this = nsSpecialSystemDirectory(nsSpecialSystemDirectory::OS_CurrentProcessDirectory);
#ifdef XP_MAC
dir += "Chrome";
*this += "Chrome";
#else
dir += "chrome";
*this += "chrome";
#endif
}
break;
case App_PluginsDirectory:
{
nsSpecialSystemDirectory dir(nsSpecialSystemDirectory::OS_CurrentProcessDirectory);
*this = nsSpecialSystemDirectory(nsSpecialSystemDirectory::OS_CurrentProcessDirectory);
#ifdef XP_MAC
dir += "Chrome";
*this += "Plugins";
#else
dir += "plugins";
*this += "plugins";
#endif
}
break;