summaryrefslogtreecommitdiff
path: root/libre/icecat/libre.patch
diff options
context:
space:
mode:
Diffstat (limited to 'libre/icecat/libre.patch')
-rw-r--r--[-rwxr-xr-x]libre/icecat/libre.patch478
1 files changed, 339 insertions, 139 deletions
diff --git a/libre/icecat/libre.patch b/libre/icecat/libre.patch
index 18dfcc177..bf2dff437 100755..100644
--- a/libre/icecat/libre.patch
+++ b/libre/icecat/libre.patch
@@ -1,35 +1,242 @@
+diff -Nur a/browser/branding/unofficial/locales/browserconfig.properties b/browser/branding/unofficial/locales/browserconfig.properties
+--- a/browser/branding/unofficial/locales/browserconfig.properties
++++ b/browser/branding/unofficial/locales/browserconfig.properties
+@@ -3,5 +3,29 @@
+ # file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+ # Do NOT localize or otherwise change these values
++
++# Default startup homepage
+ browser.startup.homepage=about:home
+-browser.search.defaultenginename="DuckDuckGo"
++
++# Default search engine
++browser.search.defaultenginename=DuckDuckGo HTML
++
++# Search engine order (order displayed in the search bar dropdown)s
++browser.search.order.1=DuckDuckGo HTML
++browser.search.order.2=DuckDuckGo Lite
++browser.search.order.3=Seeks Search
++
++# 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
++# profile database. Note that "new" is defined as "has a different URL"; this
++# 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
++
++# The default set of protocol handlers for irc:
++gecko.handlerService.schemes.irc.0.name=Freenode
++gecko.handlerService.schemes.irc.0.uriTemplate=https://webchat.freenode.net/
++
++# The default set of protocol handlers for ircs:
++gecko.handlerService.schemes.ircs.0.name=Freenode
++gecko.handlerService.schemes.ircs.0.uriTemplate=https://webchat.freenode.net/
diff -Nur a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
---- a/browser/app/profile/firefox.js
-+++ b/browser/app/profile/firefox.js
-@@ -70,6 +70,7 @@
- pref("extensions.getAddons.cache.enabled", true);
- pref("extensions.getAddons.maxResults", 15);
- pref("extensions.getAddons.get.url","http://www.gnu.org/software/gnuzilla/addons.html");
-+pref("extensions.getAddons.getWithPerformance.url","http://www.gnu.org/s/gnuzilla/addons.html");
- pref("extensions.getAddons.search.browseURL","http://www.gnu.org/software/gnuzilla/addons.html");
- pref("extensions.getAddons.search.url","http://www.gnu.org/software/gnuzilla/addons.html");
- pref("extensions.webservice.discoverURL","http://www.gnu.org/software/gnuzilla/addons.html");
-@@ -87,7 +88,7 @@
- pref("extensions.update.autoUpdateDefault", true);
-
- // Dictionary download preference
--pref("browser.dictionaries.download.url", "https://addons.mozilla.org/%LOCALE%/firefox/dictionaries/");
-+pref("browser.dictionaries.download.url","http://www.gnu.org/software/gnuzilla/addons.html");
-
- // The minimum delay in seconds for the timer to fire.
- // default=2 minutes
-diff -Nur a/browser/base/content/aboutHome.js b/browser/base/content/abouthome/aboutHome.js
---- a/browser/base/content/abouthome/aboutHome.js
-+++ b/browser/base/content/abouthome/aboutHome.js
-@@ -38,104 +38,6 @@
- *
- * ***** END LICENSE BLOCK ***** */
-
--// If a definition requires additional params, check that the final search url
--// is handled correctly by the engine.
--const SEARCH_ENGINES = {
+--- a/browser/app/profile/firefox.js 2012-12-01 16:06:30.000000000 -0200
++++ b/browser/app/profile/firefox.js 2012-12-04 20:42:20.753633713 -0200
+@@ -324,15 +324,15 @@
+ pref("browser.search.searchEnginesURL","http://www.gnu.org/software/gnuzilla/addons.html#search%20engines");
+
+ // pointer to the default engine name
+-pref("browser.search.defaultenginename", "chrome://browser-region/locale/region.properties");
++pref("browser.search.defaultenginename", "chrome://branding/locale/browserconfig.properties");
+
+ // disable logging for the search service by default
+ pref("browser.search.log", false);
+
+ // Ordering of Search Engines in the Engine list.
+-pref("browser.search.order.1", "chrome://browser-region/locale/region.properties");
+-pref("browser.search.order.2", "chrome://browser-region/locale/region.properties");
+-pref("browser.search.order.3", "chrome://browser-region/locale/region.properties");
++pref("browser.search.order.1", "chrome://branding/locale/browserconfig.properties");
++pref("browser.search.order.2", "chrome://branding/locale/browserconfig.properties");
++pref("browser.search.order.3", "chrome://branding/locale/browserconfig.properties");
+
+ // search bar results always open in a new tab
+ pref("browser.search.openintab", false);
+@@ -616,23 +616,23 @@
+ pref("browser.send_pings", false);
+
+ /* initial web feed readers list */
+-pref("browser.contentHandlers.types.0.title", "chrome://browser-region/locale/region.properties");
+-pref("browser.contentHandlers.types.0.uri", "chrome://browser-region/locale/region.properties");
++pref("browser.contentHandlers.types.0.title", "chrome://branding/locale/browserconfig.properties");
++pref("browser.contentHandlers.types.0.uri", "chrome://branding/locale/browserconfig.properties");
+ pref("browser.contentHandlers.types.0.type", "application/vnd.mozilla.maybe.feed");
+-pref("browser.contentHandlers.types.1.title", "chrome://browser-region/locale/region.properties");
+-pref("browser.contentHandlers.types.1.uri", "chrome://browser-region/locale/region.properties");
++pref("browser.contentHandlers.types.1.title", "chrome://branding/locale/browserconfig.properties");
++pref("browser.contentHandlers.types.1.uri", "chrome://branding/locale/browserconfig.properties");
+ pref("browser.contentHandlers.types.1.type", "application/vnd.mozilla.maybe.feed");
+-pref("browser.contentHandlers.types.2.title", "chrome://browser-region/locale/region.properties");
+-pref("browser.contentHandlers.types.2.uri", "chrome://browser-region/locale/region.properties");
++pref("browser.contentHandlers.types.2.title", "chrome://branding/locale/browserconfig.properties");
++pref("browser.contentHandlers.types.2.uri", "chrome://branding/locale/browserconfig.properties");
+ pref("browser.contentHandlers.types.2.type", "application/vnd.mozilla.maybe.feed");
+-pref("browser.contentHandlers.types.3.title", "chrome://browser-region/locale/region.properties");
+-pref("browser.contentHandlers.types.3.uri", "chrome://browser-region/locale/region.properties");
++pref("browser.contentHandlers.types.3.title", "chrome://branding/locale/browserconfig.properties");
++pref("browser.contentHandlers.types.3.uri", "chrome://branding/locale/browserconfig.properties");
+ pref("browser.contentHandlers.types.3.type", "application/vnd.mozilla.maybe.feed");
+-pref("browser.contentHandlers.types.4.title", "chrome://browser-region/locale/region.properties");
+-pref("browser.contentHandlers.types.4.uri", "chrome://browser-region/locale/region.properties");
++pref("browser.contentHandlers.types.4.title", "chrome://branding/locale/browserconfig.properties");
++pref("browser.contentHandlers.types.4.uri", "chrome://branding/locale/browserconfig.properties");
+ pref("browser.contentHandlers.types.4.type", "application/vnd.mozilla.maybe.feed");
+-pref("browser.contentHandlers.types.5.title", "chrome://browser-region/locale/region.properties");
+-pref("browser.contentHandlers.types.5.uri", "chrome://browser-region/locale/region.properties");
++pref("browser.contentHandlers.types.5.title", "chrome://branding/locale/browserconfig.properties");
++pref("browser.contentHandlers.types.5.uri", "chrome://branding/locale/browserconfig.properties");
+ pref("browser.contentHandlers.types.5.type", "application/vnd.mozilla.maybe.feed");
+
+ pref("browser.feeds.handler", "ask");
+@@ -643,7 +643,7 @@
+ // region.properties file is newer than the version number in the handler
+ // service datastore, it will add any new handlers it finds in the prefs (as
+ // seeded by this file) to its datastore.
+-pref("gecko.handlerService.defaultHandlersVersion", "chrome://browser-region/locale/region.properties");
++pref("gecko.handlerService.defaultHandlersVersion", "chrome://branding/locale/browserconfig.properties");
+
+ // The default set of web-based protocol handlers shown in the application
+ // selection dialog for webcal: ; I've arbitrarily picked 4 default handlers
+@@ -651,65 +651,65 @@
+ // protocol not currently listed here), we should go ahead and add those.
+
+ // webcal
+-pref("gecko.handlerService.schemes.webcal.0.name", "chrome://browser-region/locale/region.properties");
+-pref("gecko.handlerService.schemes.webcal.0.uriTemplate", "chrome://browser-region/locale/region.properties");
+-pref("gecko.handlerService.schemes.webcal.1.name", "chrome://browser-region/locale/region.properties");
+-pref("gecko.handlerService.schemes.webcal.1.uriTemplate", "chrome://browser-region/locale/region.properties");
+-pref("gecko.handlerService.schemes.webcal.2.name", "chrome://browser-region/locale/region.properties");
+-pref("gecko.handlerService.schemes.webcal.2.uriTemplate", "chrome://browser-region/locale/region.properties");
+-pref("gecko.handlerService.schemes.webcal.3.name", "chrome://browser-region/locale/region.properties");
+-pref("gecko.handlerService.schemes.webcal.3.uriTemplate", "chrome://browser-region/locale/region.properties");
++pref("gecko.handlerService.schemes.webcal.0.name", "chrome://branding/locale/browserconfig.properties");
++pref("gecko.handlerService.schemes.webcal.0.uriTemplate", "chrome://branding/locale/browserconfig.properties");
++pref("gecko.handlerService.schemes.webcal.1.name", "chrome://branding/locale/browserconfig.properties");
++pref("gecko.handlerService.schemes.webcal.1.uriTemplate", "chrome://branding/locale/browserconfig.properties");
++pref("gecko.handlerService.schemes.webcal.2.name", "chrome://branding/locale/browserconfig.properties");
++pref("gecko.handlerService.schemes.webcal.2.uriTemplate", "chrome://branding/locale/browserconfig.properties");
++pref("gecko.handlerService.schemes.webcal.3.name", "chrome://branding/locale/browserconfig.properties");
++pref("gecko.handlerService.schemes.webcal.3.uriTemplate", "chrome://branding/locale/browserconfig.properties");
+
+ // mailto
+-pref("gecko.handlerService.schemes.mailto.0.name", "chrome://browser-region/locale/region.properties");
+-pref("gecko.handlerService.schemes.mailto.0.uriTemplate", "chrome://browser-region/locale/region.properties");
+-pref("gecko.handlerService.schemes.mailto.1.name", "chrome://browser-region/locale/region.properties");
+-pref("gecko.handlerService.schemes.mailto.1.uriTemplate", "chrome://browser-region/locale/region.properties");
+-pref("gecko.handlerService.schemes.mailto.2.name", "chrome://browser-region/locale/region.properties");
+-pref("gecko.handlerService.schemes.mailto.2.uriTemplate", "chrome://browser-region/locale/region.properties");
+-pref("gecko.handlerService.schemes.mailto.3.name", "chrome://browser-region/locale/region.properties");
+-pref("gecko.handlerService.schemes.mailto.3.uriTemplate", "chrome://browser-region/locale/region.properties");
++pref("gecko.handlerService.schemes.mailto.0.name", "chrome://branding/locale/browserconfig.properties");
++pref("gecko.handlerService.schemes.mailto.0.uriTemplate", "chrome://branding/locale/browserconfig.properties");
++pref("gecko.handlerService.schemes.mailto.1.name", "chrome://branding/locale/browserconfig.properties");
++pref("gecko.handlerService.schemes.mailto.1.uriTemplate", "chrome://branding/locale/browserconfig.properties");
++pref("gecko.handlerService.schemes.mailto.2.name", "chrome://branding/locale/browserconfig.properties");
++pref("gecko.handlerService.schemes.mailto.2.uriTemplate", "chrome://branding/locale/browserconfig.properties");
++pref("gecko.handlerService.schemes.mailto.3.name", "chrome://branding/locale/browserconfig.properties");
++pref("gecko.handlerService.schemes.mailto.3.uriTemplate", "chrome://branding/locale/browserconfig.properties");
+
+ // irc
+-pref("gecko.handlerService.schemes.irc.0.name", "chrome://browser-region/locale/region.properties");
+-pref("gecko.handlerService.schemes.irc.0.uriTemplate", "chrome://browser-region/locale/region.properties");
+-pref("gecko.handlerService.schemes.irc.1.name", "chrome://browser-region/locale/region.properties");
+-pref("gecko.handlerService.schemes.irc.1.uriTemplate", "chrome://browser-region/locale/region.properties");
+-pref("gecko.handlerService.schemes.irc.2.name", "chrome://browser-region/locale/region.properties");
+-pref("gecko.handlerService.schemes.irc.2.uriTemplate", "chrome://browser-region/locale/region.properties");
+-pref("gecko.handlerService.schemes.irc.3.name", "chrome://browser-region/locale/region.properties");
+-pref("gecko.handlerService.schemes.irc.3.uriTemplate", "chrome://browser-region/locale/region.properties");
++pref("gecko.handlerService.schemes.irc.0.name", "chrome://branding/locale/browserconfig.properties");
++pref("gecko.handlerService.schemes.irc.0.uriTemplate", "chrome://branding/locale/browserconfig.properties");
++pref("gecko.handlerService.schemes.irc.1.name", "chrome://branding/locale/browserconfig.properties");
++pref("gecko.handlerService.schemes.irc.1.uriTemplate", "chrome://branding/locale/browserconfig.properties");
++pref("gecko.handlerService.schemes.irc.2.name", "chrome://branding/locale/browserconfig.properties");
++pref("gecko.handlerService.schemes.irc.2.uriTemplate", "chrome://branding/locale/browserconfig.properties");
++pref("gecko.handlerService.schemes.irc.3.name", "chrome://branding/locale/browserconfig.properties");
++pref("gecko.handlerService.schemes.irc.3.uriTemplate", "chrome://branding/locale/browserconfig.properties");
+
+ // ircs
+-pref("gecko.handlerService.schemes.ircs.0.name", "chrome://browser-region/locale/region.properties");
+-pref("gecko.handlerService.schemes.ircs.0.uriTemplate", "chrome://browser-region/locale/region.properties");
+-pref("gecko.handlerService.schemes.ircs.1.name", "chrome://browser-region/locale/region.properties");
+-pref("gecko.handlerService.schemes.ircs.1.uriTemplate", "chrome://browser-region/locale/region.properties");
+-pref("gecko.handlerService.schemes.ircs.2.name", "chrome://browser-region/locale/region.properties");
+-pref("gecko.handlerService.schemes.ircs.2.uriTemplate", "chrome://browser-region/locale/region.properties");
+-pref("gecko.handlerService.schemes.ircs.3.name", "chrome://browser-region/locale/region.properties");
+-pref("gecko.handlerService.schemes.ircs.3.uriTemplate", "chrome://browser-region/locale/region.properties");
++pref("gecko.handlerService.schemes.ircs.0.name", "chrome://branding/locale/browserconfig.properties");
++pref("gecko.handlerService.schemes.ircs.0.uriTemplate", "chrome://branding/locale/browserconfig.properties");
++pref("gecko.handlerService.schemes.ircs.1.name", "chrome://branding/locale/browserconfig.properties");
++pref("gecko.handlerService.schemes.ircs.1.uriTemplate", "chrome://branding/locale/browserconfig.properties");
++pref("gecko.handlerService.schemes.ircs.2.name", "chrome://branding/locale/browserconfig.properties");
++pref("gecko.handlerService.schemes.ircs.2.uriTemplate", "chrome://branding/locale/browserconfig.properties");
++pref("gecko.handlerService.schemes.ircs.3.name", "chrome://branding/locale/browserconfig.properties");
++pref("gecko.handlerService.schemes.ircs.3.uriTemplate", "chrome://branding/locale/browserconfig.properties");
+
+ // By default, we don't want protocol/content handlers to be registered from a different host, see bug 402287
+ pref("gecko.handlerService.allowRegisterFromDifferentHost", false);
+
+ #ifdef MOZ_SAFE_BROWSING
+-pref("browser.safebrowsing.enabled", true);
+-pref("browser.safebrowsing.malware.enabled", true);
++pref("browser.safebrowsing.enabled", false);
++pref("browser.safebrowsing.malware.enabled", false);
+ pref("browser.safebrowsing.debug", false);
+
+-pref("browser.safebrowsing.updateURL", "http://safebrowsing.clients.google.com/safebrowsing/downloads?client=SAFEBROWSING_ID&appver=%VERSION%&pver=2.2");
+-pref("browser.safebrowsing.keyURL", "https://sb-ssl.google.com/safebrowsing/newkey?client=SAFEBROWSING_ID&appver=%VERSION%&pver=2.2");
+-pref("browser.safebrowsing.gethashURL", "http://safebrowsing.clients.google.com/safebrowsing/gethash?client=SAFEBROWSING_ID&appver=%VERSION%&pver=2.2");
+-pref("browser.safebrowsing.reportURL", "http://safebrowsing.clients.google.com/safebrowsing/report?");
+-pref("browser.safebrowsing.reportGenericURL", "http://%LOCALE%.phish-generic.mozilla.com/?hl=%LOCALE%");
+-pref("browser.safebrowsing.reportErrorURL", "http://%LOCALE%.phish-error.mozilla.com/?hl=%LOCALE%");
+-pref("browser.safebrowsing.reportPhishURL", "http://%LOCALE%.phish-report.mozilla.com/?hl=%LOCALE%");
+-pref("browser.safebrowsing.reportMalwareURL", "http://%LOCALE%.malware-report.mozilla.com/?hl=%LOCALE%");
+-pref("browser.safebrowsing.reportMalwareErrorURL", "http://%LOCALE%.malware-error.mozilla.com/?hl=%LOCALE%");
++pref("browser.safebrowsing.updateURL", "");
++pref("browser.safebrowsing.keyURL", "");
++pref("browser.safebrowsing.gethashURL", "");
++pref("browser.safebrowsing.reportURL", "");
++pref("browser.safebrowsing.reportGenericURL", "");
++pref("browser.safebrowsing.reportErrorURL", "");
++pref("browser.safebrowsing.reportPhishURL", "");
++pref("browser.safebrowsing.reportMalwareURL", "");
++pref("browser.safebrowsing.reportMalwareErrorURL", "");
+
+-pref("browser.safebrowsing.warning.infoURL", "http://www.mozilla.com/%LOCALE%/firefox/phishing-protection/");
+-pref("browser.safebrowsing.malware.reportURL", "http://safebrowsing.clients.google.com/safebrowsing/diagnostic?client=%NAME%&hl=%LOCALE%&site=");
++pref("browser.safebrowsing.warning.infoURL", "");
++pref("browser.safebrowsing.malware.reportURL", "");
+
+ // Name of the about: page contributed by safebrowsing to handle display of error
+ // pages on phishing/malware hits. (bug 399233)
+@@ -1149,13 +1149,3 @@
+ // might keep around more than this, but we'll try to get down to this value).
+ // (This is intentionally on the high side; see bug 746055.)
+ pref("image.mem.max_decoded_image_kb", 256000);
+-
+-// Example social provider
+-pref("social.manifest.facebook", "{\"origin\":\"https://www.facebook.com\",\"name\":\"Facebook Messenger\",\"workerURL\":\"https://www.facebook.com/desktop/fbdesktop2/socialfox/fbworker.js.php\",\"iconURL\":\"data:image/x-icon;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8%2F9hAAAAX0lEQVQ4jWP4%2F%2F8%2FAyUYTFhHzjgDxP9JxGeQDSBVMxgTbUBCxer%2Fr999%2BQ8DJBuArJksA9A10s8AXIBoA0B%2BR%2FY%2FjD%2BEwoBoA1yT5v3PbdmCE8MAshhID%2FUMoDgzUYIBj0Cgi7ar4coAAAAASUVORK5CYII%3D\",\"sidebarURL\":\"https://www.facebook.com/desktop/fbdesktop2/?socialfox=true\"}");
+-// Comma-separated list of nsIURI::prePaths that are allowed to activate
+-// built-in social functionality.
+-pref("social.activation.whitelist", "https://www.facebook.com");
+-pref("social.sidebar.open", true);
+-pref("social.sidebar.unload_timeout_ms", 10000);
+-pref("social.active", false);
+-pref("social.toast-notifications.enabled", true);
+diff -Nur a/browser/branding/unofficial/content/aboutHome.js b/browser/branding/unofficial/content/aboutHome.js
+--- a/browser/branding/unofficial/content/aboutHome.js
++++ b/browser/branding/unofficial/content/aboutHome.js
+@@ -5,100 +5,41 @@
+ // If a definition requires additional params, check that the final search url
+ // is handled correctly by the engine.
+ const SEARCH_ENGINES = {
+- "Duck Duck Go": {
+- image: "data:image/png;base64,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"},
- "Google": {
-- image: "data:image/png;base64," +
++ "DuckDuckGo HTML": {
+ image: "data:image/png;base64," +
- "iVBORw0KGgoAAAANSUhEUgAAAEYAAAAcCAYAAADcO8kVAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJ" +
- "bWFnZVJlYWR5ccllPAAADHdJREFUeNrsWQl0VNUZvve9NzNJJpnsIkuEJMoqAVJAodCKoFUsAUFQ" +
- "qhig0npaRUE8Viv1FFtQWxSwLXVhEawbhOWobOICFCGiEIIQRGIgCSFjMslsb9567+1/Z+7gmIYK" +
@@ -120,81 +327,97 @@ diff -Nur a/browser/base/content/aboutHome.js b/browser/base/content/abouthome/a
- "/UOfx9jvvTHBKP+/RmKRoHwIiYg8pgQJsszTKFYSV2qC0VcShyqnqlEKRpolqsAyFfnpKmLOnOgr" +
- "VAVirhYnYzsZLbgSe57nwtL375N8H+Oy3H2qKpAKEL5eVc65E04rD2NW66uWrUDobKnAnPs7PR5+" +
- "tLFQHjMS0knhEZLdim/8bxId+RetX/4RYACXlwEEPBQycwAAAABJRU5ErkJggg=="
-- }
--};
--
- // The process of adding a new default snippet involves:
- // * add a new entity to aboutHome.dtd
- // * add a <span/> for it in aboutHome.xhtml
-@@ -143,7 +45,7 @@
- // The <a/> part of the snippet will be linked to the corresponding url.
- const DEFAULT_SNIPPETS_URLS = [
-- "http://www.mozilla.com/firefox/features/?WT.mc_ID=default1"
--, "https://addons.mozilla.org/firefox/?src=snippet&WT.mc_ID=default2"
-+ "https://www.gnu.org/software/gnuzilla/?WT.mc_ID=default1"
-+, "http://www.gnu.org/software/gnuzilla/addons.html?src=snippet&WT.mc_ID=default2"
- ];
++ "iVBORw0KGgoAAAANSUhEUgAAAC8AAAAcCAYAAADxyeavAAAABmJLR0QA/wD/AP+gvaeTAAAACXBI" +
++ "WXMAAA3XAAAN1wFCKJt4AAAAB3RJTUUH3AwBERgxGkWttAAABtVJREFUWMPtmGtwVdUVx397n3Pu" +
++ "K8m9uXlASCHQIBqeEooEDAymUEAKEaGlUoeOtbYdnSmdYjud6fjBdhytLS0zdRzbWkAGsCBtSktr" +
++ "RRQFY4gWaQZQUJFwCUhISHLzuo9zzj67Hy4Cd+RD6XDBD90z59uZdX5rrf96nC24xkd7jtlb/7VS" +
++ "da6jQEYKQiA8nUwlzcm39oWfXnvuWn5LXCtDyk6V9N6x4FGvu2ceydQw7amA8PsNAO04rvD7E8KQ" +
++ "HxlTqncWbnnu0c8MfM+C+mfVh8fv144jfXPuwJoxA5QLUoJS4Gm0cnF27cY52IKsGOFas2ofDP/q" +
++ "yT/cMPieurmjvb7BfdhOuTl1CtbM27FfehnnjTdB6+yXLQv/nfMwqqqwd7+COtWGHDKkMfit+xYH" +
++ "V349fl3hu2fPne6dOv26UXWL36qdjtO4H/ffLWBZYBgIkW1aaw1KIQwTY9IEzPFjcfY1opXXWdS8" +
++ "t0wI4V03+PPjqm1z0kTLml5D4hdrIBRC5ueh471opUDKTzlw0QlABAIEVq4gtXELsqT4fNH+vaVX" +
++ "yyD/F/Cu22a2GUOHWOb4sQw+9jhCCNwVy8k/2Exh6zEiL2zBP6cOhMg4cnm0hEAIgU6lSG36I8EH" +
++ "v4Pu6y/pqZu/PueR75k5Z40biz2ct3oVid+tg1QK7XlQ+XkYNZLQN+4lWDcbPA/7zztIbdmK09SM" +
++ "yAt9OgtKIaNRAl9dSnLbdl18+J2wEGIgJ/D9q38UTv1pR8z/pTmFWinsV19DSIl2XOTSeoqeWpsl" +
++ "j09kM/DIT0lt3IQwzSvKyJo0AW3bYPnejv69oSYnskm/uHsWEPEvXYK98x9gGBmAihFEn3yMWDxN" +
++ "v62ywPvTinP3fRsqKtBXip4QqLPtyLIyvFNt07TWMifwwm8u9dXOEKmGv4A/gAA0IKtvpVsZ9KYV" +
++ "QTO7UC1DUHZTOaG7F2d6/hWO19GJMfxzeL29xO9e/uOcwOu0PducUo29Zy/CMi/qTuWFKMz3Ma4k" +
++ "wJneNN5lPT5gSp7Z20bnvEXgumg0WpP14HlopTKySiTrcwM/mChGCoTnwWXRdfv60I7L0XMJxjze" +
++ "RMLObtnn+9OoqjGgTUhIZL7CrEohIypjRgjUqVPIMaPxunvK/lse86pkEwrlXRBqdtrbTqNTKaqG" +
++ "5nP8J7cT8sks3f980U1AF/0L41izbMzKNKJAkdxcTLohkmmpPXFkaSnuB8fNnMBj2y5CWGid5YBx" +
++ "tp1ET5xIOExFNPDJeonu24n38SqEHQMg72EDr89AfeQj9fxQnJYQWBrQiEAAkkkIBr3cwLtuHMMM" +
++ "ak8jjMuKsqOTwY4OIiMrLkksdQgduwvdaZHYPgwZcfE6LJzDQVSrD2FqxAVO7WmM4cOxm5qRxUWD" +
++ "uek20Wird+YMxpjKi5NTC4FQCrvlUNb4xyiBYCXCL7D35ZPcWEz6n2GwBf76OP5FvWhHZEpea0RJ" +
++ "MbqrC5Rqygm81xPfYL/+BoEV90A6fWnKmSbqrX+hL/RtAOEbTnrPQ6RfihD+dRuR52IUvnCCyLMx" +
++ "Aov6UCf8F78u8vLQA4MgJb6vLN2WE9kYI0c0qw8+tIXf5zMqKlAdHQgpQUqCh48woBQFFwYXgE4G" +
++ "SawvRmwqQg51EHkeXp+B126B1AhDAwI5rAwViyFLSwbyf/C93TmJfFHjniOypORo4olfEvjuA5d2" +
++ "dinxn4zRf64jOzITxyJ8mYKk3cQ94cc7b4KpEUYmb9p28N85D/e9Y1g1U1fmdKs0J0/+snYc7R46" +
++ "jDV9Gtp1M51HStz9zbTbJzkaf4/OdC/p2qkMhH0cmhhm/iOjcE0QaITI1IZ2HPzLl+G+exRhmrGC" +
++ "36zdcVUsVwsfeX7Dma6pMx+wX35lXWjVQ2DbOM1vIywLeeAg79c6bDj+NzpUlFHBCAM/HI0oD/KO" +
++ "GKS11MfYM2mUASiFf9kSdFc3duObnlU9+R5a3sr9Pl98oHG9CATWDf7sCXwLF+BbOB8MA1/LYVwv" +
++ "YzKW+Ji23pO0lucjTYnlaoS+tEn6Fi4A18VuasJXM21lYcPW5uv6D3t+0m3biceX+ZbUC1GQj9vV" +
++ "w7HVc9iXfpfKwhqmRW+hPFRG1zNP07Dr9yxr9RMYPwFj/FjUsfexG/e71heqv1nYsHXzDbk96K6u" +
++ "uctLJDeLcEG+cfMYjPvvxf/FuViX70QDg6gdO7Hbz2K/tg8ViyFCoVZZXl4f/ev2Izf83qZryvQ1" +
++ "Opn6vo7HTQBjdCWyrAxcB9V2Gu9sO0ipZTTab42rWhHetvnFz8yl08VM1NYtIZlcrNPpm73+AQtD" +
++ "ahkOJ3HVAWtW7a7wb596lf8f+A8mm/+hmETyjwAAAABJRU5ErkJggg=="
+ }
+ };
+@@ -115,8 +56,8 @@
const SNIPPETS_UPDATE_INTERVAL_MS = 86400000; // 1 Day.
+
+ // Bug with dom.storage.enabled set as false
+-// We are using DDG as a default in this case.
+-let gSearchEngine = {"name": "Duck Duck Go", "searchUrl": "https://duckduckgo.com/html/?t=icecat&q=_searchTerms_"};
++// We are using DDG HTML as a default in this case.
++let gSearchEngine = {"name": "DuckDuckGo HTML", "searchUrl": "https://duckduckgo.com/html/?q=_searchTerms_"};
+
+ document.addEventListener("DOMContentLoaded", function init() {
+ setupSearchEngine();
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,28 @@
+@@ -3,30 +3,18 @@
+ # file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
# Default search engine
--browser.search.defaultenginename=Google
-+browser.search.defaultenginename=Duck Duck Go (Lite)
+-browser.search.defaultenginename=DuckDuckGo
++browser.search.defaultenginename=DuckDuckGo HTML
# Search engine order (order displayed in the search bar dropdown)s
--browser.search.order.1=Duck Duck Go
+-browser.search.order.1=DuckDuckGo
-browser.search.order.2=Google
-browser.search.order.3=Yahoo
-+browser.search.order.1=Duck Duck Go (Lite)
-+browser.search.order.2=Seeks Search
-+browser.search.order.3=YaCy
-
- # This is the default set of web based feed handlers shown in the reader
- # selection UI
+-
+-# This is the default set of web based feed handlers shown in the reader
+-# selection UI
-browser.contentHandlers.types.0.title=Bloglines
-browser.contentHandlers.types.0.uri=http://www.bloglines.com/login?r=/sub/%s
-browser.contentHandlers.types.1.title=My Yahoo
-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
-+browser.contentHandlers.types.0.title=
-+browser.contentHandlers.types.0.uri=about:blank
-+browser.contentHandlers.types.1.title=
-+browser.contentHandlers.types.1.uri=about:blank
-+browser.contentHandlers.types.2.title=
-+browser.contentHandlers.types.2.uri=about:blank
-
- # Keyword URL (for location bar searches)
+-
+-# 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/lite/?q=
++browser.search.order.1=DuckDuckGo HTML
++browser.search.order.2=DuckDuckGo Lite
++browser.search.order.3=Seeks Search
# 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
# for your locale's URL but do not translate them.
-browser.search.siteSearchURL=https://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient&q=site%3A{moz:domain}+{searchTerms}
-+browser.search.siteSearchURL=https://duckduckgo.com/lite/?q=site%3A{moz:domain}+{searchTerms}
++browser.search.siteSearchURL=https://duckduckgo.com/html/?q=site%3A{moz:domain}+{searchTerms}
# 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 +30,21 @@
+@@ -34,3 +22,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
+
-+# The default set of protocol handlers for webcal:
-+gecko.handlerService.schemes.webcal.0.name=
-+gecko.handlerService.schemes.webcal.0.uriTemplate=about:blank
-+
-+# The default set of protocol handlers for mailto:
-+gecko.handlerService.schemes.mailto.0.name=
-+gecko.handlerService.schemes.mailto.0.uriTemplate=about:blank
-+gecko.handlerService.schemes.mailto.1.name=
-+gecko.handlerService.schemes.mailto.1.uriTemplate=about:blank
-+
+# The default set of protocol handlers for irc:
+gecko.handlerService.schemes.irc.0.name=Freenode
+gecko.handlerService.schemes.irc.0.uriTemplate=https://webchat.freenode.net/
@@ -240,7 +463,7 @@ diff -Nur a/build/pgo/blueprint/elements.html b/build/pgo/blueprint/elements.htm
<p>
<a>&lt;a&gt; anchor</a><br>
- <a href="http://www.google.com">&lt;a&gt; a + href</a>
-+ <a href="https://duckduckgo.com/lite">&lt;a&gt; a + href</a>
++ <a href="https://duckduckgo.com/html">&lt;a&gt; a + href</a>
</p>
<p>
<abbr title="extended abbr text should show when mouse over">&lt;abbr&gt; abbr - extended text when mouseover.</abbr><br>
@@ -252,7 +475,7 @@ diff -Nur a/dom/ipc/test.xul b/dom/ipc/test.xul
</toolbar>
- <browser type="content" src="http://www.google.com/" flex="1" id="page" remote="true"/>
-+ <browser type="content" src="https://duckduckgo.com/lite" flex="1" id="page" remote="true"/>
++ <browser type="content" src="https://duckduckgo.com/html" flex="1" id="page" remote="true"/>
<label id="messageLog" value="" crop="center"/>
</window>
diff -Nur a/layout/ipc/test-ipcbrowser.xul b/layout/ipc/test-ipcbrowser.xul
@@ -263,7 +486,7 @@ diff -Nur a/layout/ipc/test-ipcbrowser.xul b/layout/ipc/test-ipcbrowser.xul
</toolbar>
- <browser type="content" src="http://www.google.com/" flex="1" id="content"
-+ <browser type="content" src="https://duckduckgo.com/lite" flex="1" id="content"
++ <browser type="content" src="https://duckduckgo.com/html" flex="1" id="content"
remote="true"/>
</window>
diff -Nur a/mobile/android/app/mobile.js b/mobile/android/app/mobile.js
@@ -280,63 +503,60 @@ diff -Nur a/mobile/android/app/mobile.js b/mobile/android/app/mobile.js
-pref("extensions.getAddons.browseAddons", "https://addons.mozilla.org/%LOCALE%/android/");
-pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/%LOCALE%/android/api/%API_VERSION%/search/guid:%IDS%?src=mobile&appOS=%OS%&appVersion=%VERSION%");
-pref("extensions.getAddons.getWithPerformance.url", "https://services.addons.mozilla.org/%LOCALE%/android/api/%API_VERSION%/search/guid:%IDS%?src=mobile&appOS=%OS%&appVersion=%VERSION%&tMain=%TIME_MAIN%&tFirstPaint=%TIME_FIRST_PAINT%&tSessionRestored=%TIME_SESSION_RESTORED%");
-+pref("extensions.getAddons.recommended.browseURL","http://www.gnu.org/s/gnuzilla/addons.html");
-+pref("extensions.getAddons.recommended.url","http://www.gnu.org/s/gnuzilla/addons.html");
-+pref("extensions.getAddons.search.browseURL","http://www.gnu.org/s/gnuzilla/addons.html");
-+pref("extensions.getAddons.search.url","http://www.gnu.org/s/gnuzilla/addons.html");
-+pref("extensions.getAddons.browseAddons","http://www.gnu.org/s/gnuzilla/addons.html");
-+pref("extensions.getAddons.get.url","http://www.gnu.org/s/gnuzilla/addons.html");
-+pref("extensions.getAddons.getWithPerformance.url","http://www.gnu.org/s/gnuzilla/addons.html");
++pref("extensions.getAddons.recommended.browseURL","http://www.gnu.org/software/gnuzilla/addons.html");
++pref("extensions.getAddons.recommended.url","http://www.gnu.org/software/gnuzilla/addons.html");
++pref("extensions.getAddons.search.browseURL","http://www.gnu.org/software/gnuzilla/addons.html");
++pref("extensions.getAddons.search.url","http://www.gnu.org/software/gnuzilla/addons.html");
++pref("extensions.getAddons.browseAddons","http://www.gnu.org/software/gnuzilla/addons.html");
++pref("extensions.getAddons.get.url","http://www.gnu.org/software/gnuzilla/addons.html");
++pref("extensions.getAddons.getWithPerformance.url","http://www.gnu.org/software/gnuzilla/addons.html");
/* 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,18 @@
+--- 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=Duck Duck Go (Lite)
++browser.search.defaultenginename=DuckDuckGo HTML
# Search engine order (order displayed in the search bar dropdown)s
-browser.search.order.1=Google
-+browser.search.order.1=Duck Duck Go (Lite)
-
- # This is the default set of web based feed handlers shown in the reader
- # selection UI
+-
+-# This is the default set of web based feed handlers shown in the reader
+-# selection UI
-browser.contentHandlers.types.0.title=My Yahoo
-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.contentHandlers.types.0.title=
-+browser.contentHandlers.types.0.uri=about:blank
-+browser.contentHandlers.types.1.title=
-+browser.contentHandlers.types.1.uri=about:blank
-
- # 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/lite/?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
-@@ -22,11 +20,11 @@
+@@ -21,12 +11,10 @@
+ # don't make any spelling errors here.
gecko.handlerService.defaultHandlersVersion=2
- # The default set of protocol handlers for webcal:
+-# The default set of protocol handlers for webcal:
-gecko.handlerService.schemes.webcal.0.name=30 Boxes
-gecko.handlerService.schemes.webcal.0.uriTemplate=http://30boxes.com/external/widget?refer=ff&url=%s
-+gecko.handlerService.schemes.webcal.0.name=
-+gecko.handlerService.schemes.webcal.0.uriTemplate=about:blank
-
- # The default set of protocol handlers for mailto:
+-
+-# The default set of protocol handlers for mailto:
-gecko.handlerService.schemes.mailto.0.name=Yahoo! Mail
-gecko.handlerService.schemes.mailto.0.uriTemplate=http://compose.mail.yahoo.com/?To=%s
-gecko.handlerService.schemes.mailto.1.name=Gmail
-gecko.handlerService.schemes.mailto.1.uriTemplate=https://mail.google.com/mail/?extsrc=mailto&url=%s
-+gecko.handlerService.schemes.mailto.0.name=
-+gecko.handlerService.schemes.mailto.0.uriTemplate=about:blank
-+gecko.handlerService.schemes.mailto.1.name=
-+gecko.handlerService.schemes.mailto.1.uriTemplate=about:blank
++# The default set of protocol handlers for irc:
++gecko.handlerService.schemes.irc.0.name=Freenode
++gecko.handlerService.schemes.irc.0.uriTemplate=https://webchat.freenode.net/
++
++# The default set of protocol handlers for ircs:
++gecko.handlerService.schemes.ircs.0.name=Freenode
++gecko.handlerService.schemes.ircs.0.uriTemplate=https://webchat.freenode.net/
diff -Nur a/mobile/xul/app/mobile.js b/mobile/xul/app/mobile.js
--- a/mobile/xul/app/mobile.js
+++ b/mobile/xul/app/mobile.js
@@ -351,13 +571,13 @@ diff -Nur a/mobile/xul/app/mobile.js b/mobile/xul/app/mobile.js
-pref("extensions.getAddons.browseAddons", "https://addons.mozilla.org/%LOCALE%/mobile/");
-pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/%LOCALE%/mobile/api/%API_VERSION%/search/guid:%IDS%?src=mobile&appOS=%OS%&appVersion=%VERSION%");
-pref("extensions.getAddons.getWithPerformance.url", "https://services.addons.mozilla.org/%LOCALE%/mobile/api/%API_VERSION%/search/guid:%IDS%?src=mobile&appOS=%OS%&appVersion=%VERSION%&tMain=%TIME_MAIN%&tFirstPaint=%TIME_FIRST_PAINT%&tSessionRestored=%TIME_SESSION_RESTORED%");
-+pref("extensions.getAddons.recommended.browseURL","http://www.gnu.org/s/gnuzilla/addons.html");
-+pref("extensions.getAddons.recommended.url","http://www.gnu.org/s/gnuzilla/addons.html");
-+pref("extensions.getAddons.search.browseURL","http://www.gnu.org/s/gnuzilla/addons.html");
-+pref("extensions.getAddons.search.url","http://www.gnu.org/s/gnuzilla/addons.html");
-+pref("extensions.getAddons.browseAddons","http://www.gnu.org/s/gnuzilla/addons.html");
-+pref("extensions.getAddons.get.url","http://www.gnu.org/s/gnuzilla/addons.html");
-+pref("extensions.getAddons.getWithPerformance.url","http://www.gnu.org/s/gnuzilla/addons.html");
++pref("extensions.getAddons.recommended.browseURL","http://www.gnu.org/software/gnuzilla/addons.html");
++pref("extensions.getAddons.recommended.url","http://www.gnu.org/software/gnuzilla/addons.html");
++pref("extensions.getAddons.search.browseURL","http://www.gnu.org/software/gnuzilla/addons.html");
++pref("extensions.getAddons.search.url","http://www.gnu.org/software/gnuzilla/addons.html");
++pref("extensions.getAddons.browseAddons","http://www.gnu.org/software/gnuzilla/addons.html");
++pref("extensions.getAddons.get.url","http://www.gnu.org/software/gnuzilla/addons.html");
++pref("extensions.getAddons.getWithPerformance.url","http://www.gnu.org/software/gnuzilla/addons.html");
/* preference for the locale picker */
pref("extensions.getLocales.get.url", "");
@@ -366,7 +586,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/lite/?q=");
++pref("keyword.URL","");
pref("accessibility.typeaheadfind", false);
pref("accessibility.typeaheadfind.timeout", 5000);
@@ -378,27 +598,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/lite/?q=");
++pref("keyword.URL","");
pref("keyword.enabled", false);
pref("general.useragent.locale", "chrome://global/locale/intl.properties");
pref("general.useragent.compatMode.firefox", false);
-diff -Naur a/toolkit/locales/en-US/chrome/global-region/region.properties b/toolkit/locales/en-US/chrome/global-region/region.properties
---- a/toolkit/locales/en-US/chrome/global-region/region.properties
-+++ b/toolkit/locales/en-US/chrome/global-region/region.properties
-@@ -4,10 +4,10 @@
- pluginStartupMessage=Starting Plugin for type
-
- # plug-ins URLs
--more_plugins_label=mozilla.org
--more_plugins_url=https://pfs.mozilla.org/plugins/
--pluginupdates_label=mozilla.com/plugincheck
--pluginupdates_url=http://www.mozilla.com/plugincheck/
--plugindoc_label=plugindoc.mozdev.org
--plugindoc_url=http://plugindoc.mozdev.org/
-+more_plugins_label=
-+more_plugins_url=about:blank
-+pluginupdates_label=
-+pluginupdates_url=about:blank
-+plugindoc_label=
-+plugindoc_url=about:blank
-