Pier Angelo Vendrame pushed to branch tor-browser-115.5.0esr-13.0-1 at The Tor Project / Applications / Tor Browser
Commits:
-
2daa3177
by Pier Angelo Vendrame at 2023-12-11T12:50:01+01:00
-
0c9c5483
by Pier Angelo Vendrame at 2023-12-11T12:50:02+01:00
6 changed files:
- browser/components/BrowserGlue.sys.mjs
- − browser/components/search/extensions/blockchair-onion/favicon.png
- − browser/components/search/extensions/blockchair-onion/manifest.json
- − browser/components/search/extensions/blockchair/favicon.png
- − browser/components/search/extensions/blockchair/manifest.json
- toolkit/components/search/SearchService.sys.mjs
Changes:
| ... | ... | @@ -4591,7 +4591,9 @@ BrowserGlue.prototype = { |
| 4591 | 4591 | // migration to packaged locales.
|
| 4592 | 4592 | // Version 2: Tor Browser 13.0/13.0a1: tor-browser#41845. Also, removed some
|
| 4593 | 4593 | // torbutton preferences that are not used anymore.
|
| 4594 | - const TBB_MIGRATION_VERSION = 2;
|
|
| 4594 | + // Version 3: Tor Browser 13.0.7/13.5a3: Remove blockchair
|
|
| 4595 | + // (tor-browser#42283).
|
|
| 4596 | + const TBB_MIGRATION_VERSION = 3;
|
|
| 4595 | 4597 | const MIGRATION_PREF = "torbrowser.migration.version";
|
| 4596 | 4598 | |
| 4597 | 4599 | // If we decide to force updating users to pass through any version
|
| ... | ... | @@ -4643,6 +4645,22 @@ BrowserGlue.prototype = { |
| 4643 | 4645 | }
|
| 4644 | 4646 | }
|
| 4645 | 4647 | }
|
| 4648 | + if (currentVersion < 3) {
|
|
| 4649 | + (async () => {
|
|
| 4650 | + try {
|
|
| 4651 | + const engine = await lazy.AddonManager.getAddonByID(
|
|
| 4652 | + "blockchair@search.mozilla.org"
|
|
| 4653 | + );
|
|
| 4654 | + await engine?.uninstall();
|
|
| 4655 | + } catch {}
|
|
| 4656 | + try {
|
|
| 4657 | + const engine = await lazy.AddonManager.getAddonByID(
|
|
| 4658 | + "blockchair-onion@search.mozilla.org"
|
|
| 4659 | + );
|
|
| 4660 | + engine?.uninstall();
|
|
| 4661 | + } catch {}
|
|
| 4662 | + })();
|
|
| 4663 | + }
|
|
| 4646 | 4664 | |
| 4647 | 4665 | Services.prefs.setIntPref(MIGRATION_PREF, TBB_MIGRATION_VERSION);
|
| 4648 | 4666 | },
|
| 1 | -{
|
|
| 2 | - "name": "BlockchairOnion",
|
|
| 3 | - "description": "Blockchair Onion",
|
|
| 4 | - "manifest_version": 2,
|
|
| 5 | - "version": "1.0",
|
|
| 6 | - "applications": {
|
|
| 7 | - "gecko": {
|
|
| 8 | - "id": "blockchair-onion@search.mozilla.org"
|
|
| 9 | - }
|
|
| 10 | - },
|
|
| 11 | - "hidden": true,
|
|
| 12 | - "icons": {
|
|
| 13 | - "16": "favicon.png"
|
|
| 14 | - },
|
|
| 15 | - "web_accessible_resources": [
|
|
| 16 | - "favicon.png"
|
|
| 17 | - ],
|
|
| 18 | - "chrome_settings_overrides": {
|
|
| 19 | - "search_provider": {
|
|
| 20 | - "name": "BlockchairOnion",
|
|
| 21 | - "search_url": "http://blkchairbknpn73cfjhevhla7rkp4ed5gg2knctvv7it4lioy22defid.onion/search",
|
|
| 22 | - "search_form": "http://blkchairbknpn73cfjhevhla7rkp4ed5gg2knctvv7it4lioy22defid.onion/search/?q={searchTerms}",
|
|
| 23 | - "search_url_get_params": "q={searchTerms}"
|
|
| 24 | - }
|
|
| 25 | - }
|
|
| 26 | -} |
| 1 | -{
|
|
| 2 | - "name": "Blockchair",
|
|
| 3 | - "description": "Blockchair",
|
|
| 4 | - "manifest_version": 2,
|
|
| 5 | - "version": "1.0",
|
|
| 6 | - "applications": {
|
|
| 7 | - "gecko": {
|
|
| 8 | - "id": "blockchair@search.mozilla.org"
|
|
| 9 | - }
|
|
| 10 | - },
|
|
| 11 | - "hidden": true,
|
|
| 12 | - "icons": {
|
|
| 13 | - "16": "favicon.png"
|
|
| 14 | - },
|
|
| 15 | - "web_accessible_resources": [
|
|
| 16 | - "favicon.png"
|
|
| 17 | - ],
|
|
| 18 | - "chrome_settings_overrides": {
|
|
| 19 | - "search_provider": {
|
|
| 20 | - "name": "Blockchair",
|
|
| 21 | - "search_url": "https://blockchair.com/search",
|
|
| 22 | - "search_form": "https://blockchair.com/search/?q={searchTerms}",
|
|
| 23 | - "search_url_get_params": "q={searchTerms}"
|
|
| 24 | - }
|
|
| 25 | - }
|
|
| 26 | -} |
| ... | ... | @@ -2282,16 +2282,11 @@ export class SearchService { |
| 2282 | 2282 | { webExtension: { id: "ddg@search.mozilla.org" }, orderHint: 100 },
|
| 2283 | 2283 | { webExtension: { id: "youtube@search.mozilla.org" }, orderHint: 90 },
|
| 2284 | 2284 | { webExtension: { id: "google@search.mozilla.org" }, orderHint: 80 },
|
| 2285 | - { webExtension: { id: "blockchair@search.mozilla.org" }, orderHint: 70 },
|
|
| 2286 | - { webExtension: { id: "ddg-onion@search.mozilla.org" }, orderHint: 60 },
|
|
| 2287 | - {
|
|
| 2288 | - webExtension: { id: "blockchair-onion@search.mozilla.org" },
|
|
| 2289 | - orderHint: 50,
|
|
| 2290 | - },
|
|
| 2291 | - { webExtension: { id: "startpage@search.mozilla.org" }, orderHint: 40 },
|
|
| 2292 | - { webExtension: { id: "twitter@search.mozilla.org" }, orderHint: 30 },
|
|
| 2293 | - { webExtension: { id: "wikipedia@search.mozilla.org" }, orderHint: 20 },
|
|
| 2294 | - { webExtension: { id: "yahoo@search.mozilla.org" }, orderHint: 10 },
|
|
| 2285 | + { webExtension: { id: "ddg-onion@search.mozilla.org" }, orderHint: 70 },
|
|
| 2286 | + { webExtension: { id: "startpage@search.mozilla.org" }, orderHint: 60 },
|
|
| 2287 | + { webExtension: { id: "twitter@search.mozilla.org" }, orderHint: 50 },
|
|
| 2288 | + { webExtension: { id: "wikipedia@search.mozilla.org" }, orderHint: 40 },
|
|
| 2289 | + { webExtension: { id: "yahoo@search.mozilla.org" }, orderHint: 30 },
|
|
| 2295 | 2290 | ];
|
| 2296 | 2291 | |
| 2297 | 2292 | for (let e of engines) {
|