Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-26 14:22:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixing bug 29093. Removiong the need for commandline argument for shrimp. r=gayatrib

Browse Source
This commit is contained in:
racham%netscape.com 2000-05-17 06:10:30 +00:00
parent 27c39f5a90
commit c98d6c3129
1 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
profile/src/nsProfile.cpp
View File

@ -91,7 +91,6 @@
#define INSTALLER_CMD_LINE_ARG "-installer"
#define CREATE_PROFILE_CMD_LINE_ARG "-CreateProfile"
#define PROFILE_CMD_LINE_ARG "-P"
#define SHRIMP_CMD_LINE_ARG "-Shrimp"
#define PREF_CONFIRM_AUTOMIGRATION "profile.confirm_automigration"
#define SHRIMP_PREF "shrimp.startup.enable"
@ -113,7 +112,6 @@
static nsProfileAccess* gProfileDataAccess = nsnull;
static PRInt32 gDataAccessInstCount = 0;
static PRBool mCurrentProfileAvailable = PR_FALSE;
static PRBool gShrimpFlag = PR_FALSE;
// IID and CIDs of all the services needed
static NS_DEFINE_CID(kIProfileIID, NS_IPROFILE_IID);
@ -267,6 +265,12 @@ nsProfile::LoadDefaultProfileDir(nsCString & profileURLStr)
if (NS_FAILED(rv))
return rv;
PRBool shrimpPrefEnabled = PR_FALSE;
prefs->GetBoolPref(SHRIMP_PREF, &shrimpPrefEnabled);
if (shrimpPrefEnabled)
profileURLStr = "";
if (profileURLStr.Length() == 0)
{
// This means that there was no command-line argument to force
@ -288,10 +292,7 @@ nsProfile::LoadDefaultProfileDir(nsCString & profileURLStr)
profileURLStr = PROFILE_SELECTION_URL;
}
PRBool shrimpPrefEnabled = PR_FALSE;
prefs->GetBoolPref(SHRIMP_PREF, &shrimpPrefEnabled);
if ((profileURLStr.Length() != 0) && !(shrimpPrefEnabled && gShrimpFlag))
if ((profileURLStr.Length() != 0) && !(shrimpPrefEnabled))
{
rv = NS_NewURI(getter_AddRefs(profileURL), (const char *)profileURLStr);
@ -564,16 +565,6 @@ nsProfile::ProcessArgs(nsICmdLineService *cmdLineArgs,
}
}
// Start Profile Wizard
rv = cmdLineArgs->GetCmdLineValue(SHRIMP_CMD_LINE_ARG, &cmdResult);
if (NS_SUCCEEDED(rv))
{
if (cmdResult) {
gShrimpFlag = PR_TRUE;
profileURLStr = "";
}
}
// Start Migaration activity
rv = cmdLineArgs->GetCmdLineValue(INSTALLER_CMD_LINE_ARG, &cmdResult);
if (NS_SUCCEEDED(rv))