diff options
author | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-04-22 10:52:18 -0400 |
---|---|---|
committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-04-22 10:52:18 -0400 |
commit | 908d987dd1dcd4899f8f7f0878514c22ca8048b7 (patch) | |
tree | 29bf5986774207c3453044e1f370fb98d2431265 /libre/iceweasel-libre/libre.patch | |
parent | 308bfb446305a96dffce945b6c4fb82b10d1b91b (diff) | |
parent | 8351d69e64a40d68fa32cfeea227b6fcf7afe974 (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/srv/git/abslibre
Diffstat (limited to 'libre/iceweasel-libre/libre.patch')
-rw-r--r-- | libre/iceweasel-libre/libre.patch | 34 |
1 files changed, 14 insertions, 20 deletions
diff --git a/libre/iceweasel-libre/libre.patch b/libre/iceweasel-libre/libre.patch index f80295e55..9d2aa7c05 100644 --- a/libre/iceweasel-libre/libre.patch +++ b/libre/iceweasel-libre/libre.patch @@ -1,19 +1,20 @@ diff -ruN mozilla-release.orig/browser/app/profile/firefox.js mozilla-release/browser/app/profile/firefox.js ---- mozilla-release.orig/browser/app/profile/firefox.js 2013-01-10 20:20:02.000000000 -0500 -+++ mozilla-release/browser/app/profile/firefox.js 2013-01-10 17:47:34.000000000 -0500 -@@ -1168,11 +1168,9 @@ +--- mozilla-release.orig/browser/app/profile/firefox.js 2013-03-26 19:17:35.000000000 -0300 ++++ mozilla-release/browser/app/profile/firefox.js 2013-04-03 16:10:57.681396937 -0300 +@@ -1176,12 +1176,9 @@ // (This is intentionally on the high side; see bug 746055.) pref("image.mem.max_decoded_image_kb", 256000); --// Example social provider +-// Default social providers -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.activation.whitelist", ""); + pref("social.sidebar.open", true); pref("social.sidebar.unload_timeout_ms", 10000); - pref("social.active", false); diff -ruN mozilla-release.orig/browser/base/content/abouthome/aboutHome.js mozilla-release/browser/base/content/abouthome/aboutHome.js --- mozilla-release.orig/browser/base/content/abouthome/aboutHome.js 2013-01-04 18:44:27.000000000 -0500 +++ mozilla-release/browser/base/content/abouthome/aboutHome.js 2013-01-10 18:26:10.000000000 -0500 @@ -156,9 +157,9 @@ diff -urN mozilla-release.orig/browser/base/content/abouthome/aboutHome.css mozi #searchText { diff -urN mozilla-release.orig/browser/locales/en-US/chrome/browser-region/region.properties mozilla-release/browser/locales/en-US/chrome/browser-region/region.properties ---- mozilla-release.orig/browser/locales/en-US/chrome/browser-region/region.properties 2012-11-20 00:45:50.000000000 -0200 -+++ mozilla-release/browser/locales/en-US/chrome/browser-region/region.properties 2012-11-28 21:45:00.486713730 -0200 -@@ -3,25 +3,18 @@ +--- mozilla-release.orig/browser/locales/en-US/chrome/browser-region/region.properties 2013-02-15 19:14:45.000000000 -0200 ++++ mozilla-release/browser/locales/en-US/chrome/browser-region/region.properties 2013-02-20 19:55:41.962705914 -0200 +@@ -3,19 +3,12 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # Default search engine @@ -180,16 +181,9 @@ diff -urN mozilla-release.orig/browser/locales/en-US/chrome/browser-region/regio +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/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,20 +23,10 @@ +@@ -24,20 +17,10 @@ # don't make any spelling errors here. gecko.handlerService.defaultHandlersVersion=3 @@ -206,14 +200,14 @@ diff -urN mozilla-release.orig/browser/locales/en-US/chrome/browser-region/regio # The default set of protocol handlers for irc: -gecko.handlerService.schemes.irc.0.name=Mibbit -gecko.handlerService.schemes.irc.0.uriTemplate=https://www.mibbit.com/?url=%s -+gecko.handlerService.schemes.irc.0.name=Freenode -+gecko.handlerService.schemes.irc.0.uriTemplate=https://webchat.freenode.net/?channels=%s ++gecko.handlerService.schemes.irc.0.name=Freenode Web IRC ++gecko.handlerService.schemes.irc.0.uriTemplate=https://webchat.freenode.net # The default set of protocol handlers for ircs: -gecko.handlerService.schemes.ircs.0.name=Mibbit -gecko.handlerService.schemes.ircs.0.uriTemplate=https://www.mibbit.com/?url=%s -+gecko.handlerService.schemes.ircs.0.name=Freenode -+gecko.handlerService.schemes.ircs.0.uriTemplate=https://webchat.freenode.net/?channels=%s ++gecko.handlerService.schemes.ircs.0.name=Freenode Web IRC ++gecko.handlerService.schemes.ircs.0.uriTemplate=https://webchat.freenode.net diff -ruN mozilla-release.orig/dom/ipc/test.xul mozilla-release/dom/ipc/test.xul --- mozilla-release.orig/dom/ipc/test.xul 2013-01-04 18:44:31.000000000 -0500 +++ mozilla-release/dom/ipc/test.xul 2013-01-10 18:19:26.000000000 -0500 |