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

Startup url shows up on every browser launch (91585). Patch by racham (backing out morse's earlier fix). r=jag sr=blake

Browse Source 
git-svn-id: svn://10.0.0.236/branches/MOZILLA_0_9_2_BRANCH@99737 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
blakeross%telocity.com
2001-07-22 21:21:38 +00:00
parent 91e8a77834
commit fdff6c2292
1 changed files with 0 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
mozilla/xpfe/bootstrap/nsAppRunner.cpp
View File

@@ -104,7 +104,6 @@ extern "C" void ShowOSAlert(char* aMessage);
#define HELP_SPACER_1 "\t"
#define HELP_SPACER_2 "\t\t"
#define HELP_SPACER_4 "\t\t\t\t"
#define PREF_HOMEPAGE_OVERRIDE "browser.startup.homepage_override.1"
#ifdef DEBUG
#include "prlog.h"
@@ -400,28 +399,8 @@ nsresult LaunchApplication(const char *aParam, PRInt32 height, PRInt32 width)
if (handlesArgs) {
nsXPIDLString defaultArgs;
/* GetDefaultArgs will always set the override pref to false but we don't want that
to happen yet (otherwise the setup page won't get displayed when a new
profile is used for the first time). So we will fetch the override pref
before calling GetDefaultArgs and, if it is true, we will restore it to back
to true after calling GetDefaultArgs
*/
PRBool override = PR_FALSE;
nsCOMPtr<nsIPrefBranch> prefBranch;
nsCOMPtr<nsIPrefService> prefs = do_GetService(NS_PREFSERVICE_CONTRACTID, &rv);
if (prefs) {
rv = prefs->GetBranch(nsnull, getter_AddRefs(prefBranch));
if (NS_SUCCEEDED(rv)) {
prefBranch->GetBoolPref(PREF_HOMEPAGE_OVERRIDE, &override);
}
}
rv = handler->GetDefaultArgs(getter_Copies(defaultArgs));
if (override) {
prefBranch->SetBoolPref(PREF_HOMEPAGE_OVERRIDE, PR_TRUE);
}
if (NS_FAILED(rv)) return rv;
rv = OpenWindow(chromeUrlForTask, defaultArgs);
}