Merge branch 'master' of gitlab.com:librewolf-community/browser/common

2021-07-14 14:09:39 +02:00 · 2021-07-14 14:09:39 +02:00 · 7294ed9baa
parent f5100f6d50 7f19765326
commit 7294ed9baa
4 changed files with 722 additions and 428 deletions
--- a/patches/search-config.patch
+++ b/patches/search-config.patch
--- a/patches/sed-patches/disable-pocket.patch
+++ b/patches/sed-patches/disable-pocket.patch
@ -23,3 +23,16 @@ index d16b27b1ea..a119166fa5 100644
     "preferences",
     "privatebrowsing",
     "prompts",
+diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
+index 16168e5..857a968 100644
+--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
+@@ -5246,8 +5246,6 @@ var XULBrowserWindow = {
+ 
+     SafeBrowsingNotificationBox.onLocationChange(aLocationURI);
+ 
+-    SaveToPocket.onLocationChange(window);
+-
+     UrlbarProviderSearchTips.onLocationChange(
+       window,
+       aLocationURI,
--- a/source_files/browser/branding/librewolf/content/about-logo.png
+++ b/source_files/browser/branding/librewolf/content/about-logo.png
--- a/source_files/browser/branding/librewolf/content/about.png
+++ b/source_files/browser/branding/librewolf/content/about.png