diff options
author | grizzlyuser <grizzlyuser@protonmail.com> | 2023-03-14 15:38:37 +0100 |
---|---|---|
committer | grizzlyuser <grizzlyuser@protonmail.com> | 2023-03-14 15:38:37 +0100 |
commit | 1a6ef6e180de7eaabffcf6daa851a05c2a482402 (patch) | |
tree | af4875a02fc63cd323f979e2b0b2e53b0628d741 /libre/iceweasel/process-json-files.py | |
parent | 08812bccbc0daf2f13179b4de34e27e1a31637bd (diff) |
[iceweasel] 111.0 Upstream updates and DDG fixes
1. Update patches according to changes from upstreams.
2. Rework DuckDuckGo patching to make it default search engine again and
change method from GET to POST (see patch comment from
9004-FSDG-misc.patch)
Diffstat (limited to 'libre/iceweasel/process-json-files.py')
-rw-r--r-- | libre/iceweasel/process-json-files.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libre/iceweasel/process-json-files.py b/libre/iceweasel/process-json-files.py index 0958872dc..a2fd0e95c 100644 --- a/libre/iceweasel/process-json-files.py +++ b/libre/iceweasel/process-json-files.py @@ -173,10 +173,8 @@ class SearchConfig(RemoteSettings): general_specifier = {} for specifier in search_engine['appliesTo'].copy(): if 'application' in specifier: - if 'distributions' in specifier['application']: - search_engine['appliesTo'].remove(specifier) - continue - specifier['application'].pop('extraParams', None) + search_engine['appliesTo'].remove(specifier) + continue if 'included' in specifier and 'everywhere' in specifier[ 'included'] and specifier['included']['everywhere']: @@ -185,8 +183,10 @@ class SearchConfig(RemoteSettings): if not general_specifier: general_specifier = {'included': {'everywhere': True}} search_engine['appliesTo'].insert(0, general_specifier) + if search_engine['webExtension']['id'] == cls._DUCKDUCKGO_SEARCH_ENGINE_ID: general_specifier['default'] = 'yes' + search_engine.pop('params') return search_engine |