Bug 348076 remove generated URLs from region.properties (r=phil, sr=mconnor)

This commit is contained in:
dietrich@mozilla.com
2006-08-19 02:00:52 +00:00
parent f2f515ad70
commit ce4728aeff
9 changed files with 49 additions and 36 deletions

View File

@@ -406,17 +406,17 @@ var nsBrowserContentHandler = {
get defaultArgs() {
var prefb = Components.classes["@mozilla.org/preferences-service;1"]
.getService(nsIPrefBranch);
var formatter = Components.classes["@mozilla.org/browser/URLFormatterService;1"]
.getService(Components.interfaces.nsIURLFormatter);
var pagesToLoad = "";
var overrideState = needHomepageOverride(prefb);
try {
if (overrideState == 1) {
pagesToLoad = prefb.getComplexValue("startup.homepage_welcome_url",
nsIPrefLocalizedString).data;
pagesToLoad = formatter.formatURLPref("startup.homepage_welcome_url", null);
}
else if (overrideState == 2) {
pagesToLoad = prefb.getComplexValue("startup.homepage_override_url",
nsIPrefLocalizedString).data;
pagesToLoad = formatter.formatURLPref("startup.homepage_override_url", null);
}
}
catch (e) {