icecat-14.0-4: fixing some parts in libre.patch

1 files changed, 17 insertions, 19 deletions

diff --git a/libre/icecat/libre.patch b/libre/icecat/libre.patch
index 4aec17d86..47410e1b7 100755
--- a/libre/icecat/libre.patch
+++ b/libre/icecat/libre.patch
@@ -134,9 +134,9 @@ diff -Nur a/browser/base/content/aboutHome.js b/browser/base/content/abouthome/a
  
  const SNIPPETS_UPDATE_INTERVAL_MS = 86400000; // 1 Day.
 diff -Nur a/browser/locales/en-US/chrome/browser-region/region.properties b/browser/locales/en-US/chrome/browser-region/region.properties
---- a/browser/locales/en-US/chrome/browser-region/region.properties
-+++ b/browser/locales/en-US/chrome/browser-region/region.properties
-@@ -1,28 +1,19 @@
+--- a/browser/locales/en-US/chrome/browser-region/region.properties	2012-08-21 21:53:59.000000000 -0300
++++ b/browser/locales/en-US/chrome/browser-region/region.properties	2012-11-30 01:17:50.561255302 -0200
+@@ -1,28 +1,16 @@
  # Default search engine
 -browser.search.defaultenginename=Google
 +browser.search.defaultenginename=DuckDuckGo HTML
@@ -154,14 +154,13 @@ diff -Nur a/browser/locales/en-US/chrome/browser-region/region.properties b/brow
 -browser.contentHandlers.types.1.uri=http://add.my.yahoo.com/rss?url=%s
 -browser.contentHandlers.types.2.title=Google
 -browser.contentHandlers.types.2.uri=http://fusion.google.com/add?feedurl=%s
+-
+-# Keyword URL (for location bar searches)
+-keyword.URL=http://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient&gfns=1&q=
 +browser.search.order.1=DuckDuckGo HTML
 +browser.search.order.2=DuckDuckGo Lite
 +browser.search.order.3=Seeks Search
- 
- # Keyword URL (for location bar searches)
--keyword.URL=http://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient&gfns=1&q=
-+keyword.URL=https://duckduckgo.com/html/?q=
- 
+  
  # URL for site-specific search engines
  # TRANSLATION NOTE: {moz:domain} and {searchTerms} are placeholders for the site
  # to be searched and the user's search query. Place them in the appropriate location
@@ -171,7 +170,7 @@ diff -Nur a/browser/locales/en-US/chrome/browser-region/region.properties b/brow
  
  # increment this number when anything gets changed in the list below.  This will
  # cause Firefox to re-read these prefs and inject any new handlers into the 
-@@ -30,3 +21,11 @@
+@@ -30,3 +18,11 @@
  # means that it's not possible to update the name of existing handler, so 
  # don't make any spelling errors here.
  gecko.handlerService.defaultHandlersVersion=3
@@ -272,9 +271,9 @@ diff -Nur a/mobile/android/app/mobile.js b/mobile/android/app/mobile.js
  /* preference for the locale picker */
  pref("extensions.getLocales.get.url", "");
 diff -Nur a/mobile/locales/en-US/chrome/region.properties b/mobile/locales/en-US/chrome/region.properties
---- a/mobile/locales/en-US/chrome/region.properties
-+++ b/mobile/locales/en-US/chrome/region.properties
-@@ -1,18 +1,11 @@
+--- a/mobile/locales/en-US/chrome/region.properties	2012-08-21 21:53:59.000000000 -0300
++++ b/mobile/locales/en-US/chrome/region.properties	2012-11-30 01:12:12.823875656 -0200
+@@ -1,18 +1,8 @@
  # Default search engine
 -browser.search.defaultenginename=Google
 +browser.search.defaultenginename=DuckDuckGo HTML
@@ -288,15 +287,14 @@ diff -Nur a/mobile/locales/en-US/chrome/region.properties b/mobile/locales/en-US
 -browser.contentHandlers.types.0.uri=http://add.my.yahoo.com/rss?url=%s
 -browser.contentHandlers.types.1.title=Google
 -browser.contentHandlers.types.1.uri=http://fusion.google.com/add?feedurl=%s
-+browser.search.order.1=DuckDuckGo HTML
- 
- # Keyword URL (for location bar searches)
+-
+-# Keyword URL (for location bar searches)
 -keyword.URL=https://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient&gfns=1&q=
-+keyword.URL=https://duckduckgo.com/html/?q=
++browser.search.order.1=DuckDuckGo HTML
  
  # increment this number when anything gets changed in the list below.  This will
  # cause Firefox to re-read these prefs and inject any new handlers into the
-@@ -21,12 +14,10 @@
+@@ -21,12 +11,10 @@
  # don't make any spelling errors here.
  gecko.handlerService.defaultHandlersVersion=2
  
@@ -345,7 +343,7 @@ diff -Nur a/mobile/xul/app/mobile.js b/mobile/xul/app/mobile.js
  
  pref("keyword.enabled", true);
 -pref("keyword.URL", "https://www.google.com/m?ie=UTF-8&oe=UTF-8&sourceid=navclient&q=");
-+pref("keyword.URL","https://duckduckgo.com/html/?q=");
++pref("keyword.URL","");
  
  pref("accessibility.typeaheadfind", false);
  pref("accessibility.typeaheadfind.timeout", 5000);
@@ -357,7 +355,7 @@ diff -Nur a/modules/libpref/src/init/all.js b/modules/libpref/src/init/all.js
   */
  
 -pref("keyword.URL", "https://www.google.com/search?ie=UTF-8&oe=utf-8&q=");
-+pref("keyword.URL","https://duckduckgo.com/html/?q=");
++pref("keyword.URL","");
  pref("keyword.enabled", false);
  pref("general.useragent.locale", "chrome://global/locale/intl.properties");
  pref("general.useragent.compatMode.firefox", false);