wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-10-19 13:47:31 +09:00
Code Issues Projects Releases Packages Wiki Activity

Remove browser.search.region usage. Tag #245.

Browse source
This commit is contained in:
Ascrod 2019-04-20 07:35:31 -04:00 • committed by Roy Tam
commit f591aeb2fa
2 changed files with 1 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

9
toolkit/components/search/current/nsSearchService.js
View file

@ -3236,14 +3236,7 @@ SearchService.prototype = {
// Fallback to building a list based on the regions in the JSON // Fallback to building a list based on the regions in the JSON
if (!engineNames || !engineNames.length) { if (!engineNames || !engineNames.length) {
let region; engineNames = searchSettings["default"]["visibleDefaultEngines"];
if (Services.prefs.prefHasUserValue("browser.search.region")) {
region = Services.prefs.getCharPref("browser.search.region");
}
if (!region || !(region in searchSettings)) {
region = "default";
}
engineNames = searchSettings[region]["visibleDefaultEngines"];
} }
for (let name of engineNames) { for (let name of engineNames) {

9
toolkit/components/urlformatter/nsURLFormatter.js
View file

@ -91,15 +91,6 @@ nsURLFormatterService.prototype = {
LOCALE: () => Cc["@mozilla.org/chrome/chrome-registry;1"]. LOCALE: () => Cc["@mozilla.org/chrome/chrome-registry;1"].
getService(Ci.nsIXULChromeRegistry). getService(Ci.nsIXULChromeRegistry).
getSelectedLocale('global'), getSelectedLocale('global'),
REGION: function() {
try {
// When the geoip lookup failed to identify the region, we fallback to
// the 'ZZ' region code to mean 'unknown'.
return Services.prefs.getCharPref("browser.search.region") || "ZZ";
} catch(e) {
return "ZZ";
}
},
VENDOR: function() { return this.appInfo.vendor; }, VENDOR: function() { return this.appInfo.vendor; },
NAME: function() { return this.appInfo.name; }, NAME: function() { return this.appInfo.name; },
ID: function() { return this.appInfo.ID; }, ID: function() { return this.appInfo.ID; },