diff --git a/mozilla/embedding/qa/jstests/nsIPrefBranchTest.txt b/mozilla/embedding/qa/jstests/nsIPrefBranchTest.txt index 2a3c35d3718..5fd1f8c7f08 100644 --- a/mozilla/embedding/qa/jstests/nsIPrefBranchTest.txt +++ b/mozilla/embedding/qa/jstests/nsIPrefBranchTest.txt @@ -31,37 +31,33 @@ Test last run on 05/09/01. netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect"); // get the nsIPrefBranch object. // if you use getBranch() then the preference file that gets affected is prefs.js. - var nsIPrefBranchObj = nsIPrefServiceObj.getBranch("browser.startup."); + var nsIPrefBranchObj = nsIPrefServiceObj.getBranch("app.update."); // verifying the attribute root. alert("root: " + nsIPrefBranchObj.root); // checking getPrefType method. - var prefType = nsIPrefBranchObj.getPrefType("homepage"); - alert("prefType: " + prefType); + alert("prefType: " + nsIPrefBranchObj.getPrefType("url")); // checking getBoolPref method. - var boo = nsIPrefBranchObj.getBoolPref("homepage_override.1"); + var boo = nsIPrefBranchObj.getBoolPref("enabled"); alert("boo: " + boo); - // checking setBoolPref method. - nsIPrefBranchObj.setBoolPref("homepage_override.1", 0); + nsIPrefBranchObj.setBoolPref("enabled", !boo); nsIPrefServiceObj.savePrefFile(null); - // checking getCharPref method. - var result = nsIPrefBranchObj.getCharPref("homepage"); - alert("charPref: " + result); + var updateUrl = nsIPrefBranchObj.getCharPref("url"); + alert("charPref: " + updateUrl); // checking setCharPref method. - nsIPrefBranchObj.setCharPref("homepage", "http://mozilla.org") + nsIPrefBranchObj.setCharPref("url", "http://mozilla.org") nsIPrefServiceObj.savePrefFile(null); - // checking getIntPref method. /* var result = nsIPrefBranchObj.getIntPref("editor.table.delete_key"); @@ -76,21 +72,21 @@ Test last run on 05/09/01. // checking clearUserPref method. /* - nsIPrefBranchObj.clearUserPref("homepage_override.1"); + nsIPrefBranchObj.clearUserPref("url"); nsIPrefServiceObj.savePrefFile(null); */ // checking lockPref method. - var boo = nsIPrefBranchObj.prefIsLocked("homepage_override.1"); + boo = nsIPrefBranchObj.prefIsLocked("url"); alert ("prefIsLocked: " + boo); - nsIPrefBranchObj.lockPref("homepage_override.1"); + nsIPrefBranchObj.lockPref("url"); nsIPrefServiceObj.savePrefFile(null); // checking prefIsLocked method. - var boo = nsIPrefBranchObj.prefIsLocked("homepage_override.1"); + var boo = nsIPrefBranchObj.prefIsLocked("url"); alert ("prefIsLocked: " + boo); /* @@ -100,9 +96,9 @@ Test last run on 05/09/01. // checking unlockPref method. - nsIPrefBranchObj.unlockPref("homepage_override.1"); + nsIPrefBranchObj.unlockPref("url"); nsIPrefServiceObj.savePrefFile(null); - alert("parefIsLocked: " + nsIPrefBranchObj.prefIsLocked("homepage_override.1")); + alert("parefIsLocked: " + nsIPrefBranchObj.prefIsLocked("url")); // checking deleteBranch @@ -123,7 +119,7 @@ Test last run on 05/09/01. // checking getChildList method. var aCount = {value:0}; - var childArray = nsIPrefBranchObj.getChildList(null , aCount); + var childArray = nsIPrefBranchObj.getChildList("", aCount); alert("aCount: " + aCount.value); //alert("Array length: " + childArray.length); alert("Array content: " + childArray.toString()); diff --git a/mozilla/suite/browser/browser-prefs.js b/mozilla/suite/browser/browser-prefs.js index 4d9b2fe2d39..91d278d91ab 100644 --- a/mozilla/suite/browser/browser-prefs.js +++ b/mozilla/suite/browser/browser-prefs.js @@ -66,9 +66,6 @@ pref("general.autoScroll", true); pref("browser.startup.page", 1); pref("browser.startup.homepage", "chrome://navigator-region/locale/region.properties"); pref("browser.startup.homepage.count", 1); -// "browser.startup.homepage_override" was for 4.x -pref("browser.startup.homepage_override.1", true); -pref("browser.startup.autoload_homepage", true); // disable this until it can be disabled on a per-docshell basis (see bug 319368) pref("browser.send_pings", false); @@ -149,14 +146,10 @@ pref("browser.translation.service", "chrome://navigator-region/locale/region.pro pref("browser.translation.serviceDomain", "chrome://navigator-region/locale/region.properties"); // Smart Browsing prefs -pref("browser.related.autoload", 1); // 0 = Always, 1 = After first use, 2 = Never pref("browser.related.provider", "http://www-rl.netscape.com/wtgn?"); pref("browser.related.disabledForDomains", ""); pref("keyword.moreInfoURL", "chrome://branding/locale/brand.properties"); -// Bookmarks prefs -pref("browser.bookmarks.confirm_sorting", true); - //Internet Search pref("browser.search.defaultenginename", "chrome://communicator-region/locale/region.properties"); @@ -170,7 +163,6 @@ pref("javascript.options.showInConsole", true); pref("offline.startup_state", 0); pref("offline.send.unsent_messages", 0); pref("offline.download.download_messages", 0); -pref("offline.prompt_synch_on_exit", true); pref("signon.rememberSignons", true); pref("signon.expireMasterPassword", false); @@ -190,7 +182,6 @@ pref("wallet.miscPanel.hide", false); pref("mail.signature_file", ""); pref("mail.directory", ""); pref("news.directory", ""); -pref("browser.editor.disabled", false); pref("spellchecker.dictionary", ""); pref("spellchecker.dictionaries.download.url", "chrome://branding/locale/brand.properties"); diff --git a/mozilla/xpfe/bootstrap/browser-prefs.js b/mozilla/xpfe/bootstrap/browser-prefs.js index 2bad59a56db..e7b027d4f3f 100644 --- a/mozilla/xpfe/bootstrap/browser-prefs.js +++ b/mozilla/xpfe/bootstrap/browser-prefs.js @@ -65,9 +65,6 @@ pref("general.autoScroll", true); pref("browser.startup.page", 1); pref("browser.startup.homepage", "chrome://navigator-region/locale/region.properties"); pref("browser.startup.homepage.count", 1); -// "browser.startup.homepage_override" was for 4.x -pref("browser.startup.homepage_override.1", true); -pref("browser.startup.autoload_homepage", true); // disable this until it can be disabled on a per-docshell basis (see bug 319368) pref("browser.send_pings", false); @@ -148,14 +145,10 @@ pref("browser.translation.service", "chrome://navigator-region/locale/region.pro pref("browser.translation.serviceDomain", "chrome://navigator-region/locale/region.properties"); // Smart Browsing prefs -pref("browser.related.autoload", 1); // 0 = Always, 1 = After first use, 2 = Never pref("browser.related.provider", "http://www-rl.netscape.com/wtgn?"); pref("browser.related.disabledForDomains", ""); pref("keyword.moreInfoURL", "chrome://branding/locale/brand.properties"); -// Bookmarks prefs -pref("browser.bookmarks.confirm_sorting", true); - //Internet Search pref("browser.search.defaultenginename", "chrome://communicator-region/locale/region.properties"); @@ -169,7 +162,6 @@ pref("javascript.options.showInConsole", true); pref("offline.startup_state", 0); pref("offline.send.unsent_messages", 0); pref("offline.download.download_messages", 0); -pref("offline.prompt_synch_on_exit", true); pref("signon.rememberSignons", true); pref("signon.expireMasterPassword", false); @@ -189,7 +181,6 @@ pref("wallet.miscPanel.hide", false); pref("mail.signature_file", ""); pref("mail.directory", ""); pref("news.directory", ""); -pref("browser.editor.disabled", false); pref("spellchecker.dictionary", ""); pref("spellchecker.dictionaries.download.url", "chrome://branding/locale/brand.properties");