summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Groman <tgroman@nuegia.net>2020-06-29 19:01:11 -0700
committerThomas Groman <tgroman@nuegia.net>2020-06-29 19:01:11 -0700
commit54f6b36396edca1555f0fba146c0e18cc4b6a141 (patch)
treefa2e7034354701dcdd97022fd46ab72e8b77ca4f
parentc6acec41b61c6d545debf4aff383e379ed950aba (diff)
downloadwebbrowser-54f6b36396edca1555f0fba146c0e18cc4b6a141.tar
webbrowser-54f6b36396edca1555f0fba146c0e18cc4b6a141.tar.gz
webbrowser-54f6b36396edca1555f0fba146c0e18cc4b6a141.tar.lz
webbrowser-54f6b36396edca1555f0fba146c0e18cc4b6a141.tar.xz
webbrowser-54f6b36396edca1555f0fba146c0e18cc4b6a141.zip
fixed search syntax29.0.0rc2
-rw-r--r--webbrowser/app/profile/webbrowser.js10
-rw-r--r--webbrowser/locales/en-US/searchplugins/pussthecat-images.xml5
-rw-r--r--webbrowser/locales/en-US/searchplugins/pussthecat.xml5
3 files changed, 11 insertions, 9 deletions
diff --git a/webbrowser/app/profile/webbrowser.js b/webbrowser/app/profile/webbrowser.js
index 15264d3..f62d29f 100644
--- a/webbrowser/app/profile/webbrowser.js
+++ b/webbrowser/app/profile/webbrowser.js
@@ -366,11 +366,11 @@ pref("browser.search.defaultenginename", "pussthecat");
pref("browser.search.log", false);
// Ordering of Search Engines in the Engine list.
-pref("browser.search.order.1", "pussthecat");
-pref("browser.search.order.2", "pussthecat-images);
-pref("browser.search.order.3", "yacy");
-pref("browser.search.order.4", "wiby");
-pref("browser.search.order.5", "internet-archive");
+pref("browser.search.order.0", "pussthecat");
+pref("browser.search.order.1", "pussthecat-images");
+pref("browser.search.order.2", "yacy");
+pref("browser.search.order.3", "wiby");
+pref("browser.search.order.4", "internet-archive");
// search bar results always open in a new tab
pref("browser.search.openintab", false);
diff --git a/webbrowser/locales/en-US/searchplugins/pussthecat-images.xml b/webbrowser/locales/en-US/searchplugins/pussthecat-images.xml
index 387a5b3..8849b16 100644
--- a/webbrowser/locales/en-US/searchplugins/pussthecat-images.xml
+++ b/webbrowser/locales/en-US/searchplugins/pussthecat-images.xml
@@ -1,11 +1,12 @@
-<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/" xmlns:os="http://a9.com/-/spec/opensearch/1.1/">
+<OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/" xmlns:ms="http://www.mozilla.org/2006/browser/search/">
<ShortName>PussTheCat Images(Searx)</ShortName>
<Description>a privacy-respecting, hackable metasearch engine</Description>
<InputEncoding>UTF-8</InputEncoding>
<Image width="16" height="16">data:image/x-icon;base64,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</Image>
+<SearchForm>https://searx.pussthecat.org</SearchForm>
<Url type="text/html" method="GET" template="https://searx.pussthecat.org" resultDomain="searx.pussthecat.org">
<Param name="q" value="{searchTerms}"/>
<Param name="language" value="en-US"/>
<Param name="category_images" value="on"/>
</Url>
-</SearchPlugin>
+</OpenSearchDescription>
diff --git a/webbrowser/locales/en-US/searchplugins/pussthecat.xml b/webbrowser/locales/en-US/searchplugins/pussthecat.xml
index e29073c..b5c63cb 100644
--- a/webbrowser/locales/en-US/searchplugins/pussthecat.xml
+++ b/webbrowser/locales/en-US/searchplugins/pussthecat.xml
@@ -1,10 +1,11 @@
-<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/" xmlns:os="http://a9.com/-/spec/opensearch/1.1/">
+<OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/" xmlns:ms="http://www.mozilla.org/2006/browser/search/">
<ShortName>PussTheCat (Searx)</ShortName>
<Description>a privacy-respecting, hackable metasearch engine</Description>
<InputEncoding>UTF-8</InputEncoding>
<Image width="16" height="16">data:image/x-icon;base64,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</Image>
+<SearchForm>https://searx.pussthecat.org</SearchForm>
<Url type="text/html" method="GET" template="https://searx.pussthecat.org" resultDomain="searx.pussthecat.org">
<Param name="q" value="{searchTerms}"/>
<Param name="language" value="en-US"/>
</Url>
-</SearchPlugin>
+</OpenSearchDescription>