From 4e490a4cf9817e641e7e3f5eef3f718b7c37f8a5 Mon Sep 17 00:00:00 2001
From: trickypr <23250792+trickypr@users.noreply.github.com>
Date: Mon, 1 May 2023 15:24:50 +1000
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20Add=20branding=20prefs=20back=20?=
 =?UTF-8?q?(#242)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* 🔥 Remove unneeded patch

* 🔧 Include required prefs
---
 src/D161738  - Python 3.11 fix.patch     | 37 ------------------------
 src/browser/app/profile/pulse-browser.js | 20 +++++++++++++
 2 files changed, 20 insertions(+), 37 deletions(-)
 delete mode 100644 src/D161738  - Python 3.11 fix.patch

diff --git a/src/D161738  - Python 3.11 fix.patch b/src/D161738  - Python 3.11 fix.patch
deleted file mode 100644
index a0808571..00000000
--- a/src/D161738  - Python 3.11 fix.patch	
+++ /dev/null
@@ -1,37 +0,0 @@
-diff --git a/xpcom/idl-parser/xpidl/xpidl.py b/xpcom/idl-parser/xpidl/xpidl.py
---- a/xpcom/idl-parser/xpidl/xpidl.py
-+++ b/xpcom/idl-parser/xpidl/xpidl.py
-@@ -1637,17 +1637,17 @@
-     literals = '"(){}[]<>,;:=|+-*'
- 
-     t_ignore = " \t"
- 
-     def t_multilinecomment(self, t):
--        r"/\*(?s).*?\*/"
-+        r"/\*(\n|.)*?\*/"
-         t.lexer.lineno += t.value.count("\n")
-         if t.value.startswith("/**"):
-             self._doccomments.append(t.value)
- 
-     def t_singlelinecomment(self, t):
--        r"(?m)//.*?$"
-+        r"//[^\n]*"
- 
-     def t_IID(self, t):
-         return t
- 
-     t_IID.__doc__ = r"%(c)s{8}-%(c)s{4}-%(c)s{4}-%(c)s{4}-%(c)s{12}" % {"c": hexchar}
-@@ -1656,11 +1656,11 @@
-         r"(unsigned\ long\ long|unsigned\ short|unsigned\ long|long\ long)(?!_?[A-Za-z][A-Za-z_0-9])|_?[A-Za-z][A-Za-z_0-9]*"  # NOQA: E501
-         t.type = self.keywords.get(t.value, "IDENTIFIER")
-         return t
- 
-     def t_LCDATA(self, t):
--        r"(?s)%\{[ ]*C\+\+[ ]*\n(?P<cdata>.*?\n?)%\}[ ]*(C\+\+)?"
-+        r"%\{[ ]*C\+\+[ ]*\n(?P<cdata>(\n|.)*?\n?)%\}[ ]*(C\+\+)?"
-         t.type = "CDATA"
-         t.value = t.lexer.lexmatch.group("cdata")
-         t.lexer.lineno += t.value.count("\n")
-         return t
- 
-
diff --git a/src/browser/app/profile/pulse-browser.js b/src/browser/app/profile/pulse-browser.js
index 0b5f777e..b82ed028 100644
--- a/src/browser/app/profile/pulse-browser.js
+++ b/src/browser/app/profile/pulse-browser.js
@@ -7,6 +7,26 @@
 // Betterfox has a lower priority than the prefs included in this file
 #include better-fox.js
 
+// Prefs from browser/branding/unofficial/prefs/firefox-branding.js:
+
+// The time interval between checks for a new version (in seconds)
+pref("app.update.interval", 86400); // 24 hours
+// Give the user x seconds to react before showing the big UI. default=24 hours
+pref("app.update.promptWaitTime", 86400);
+
+// The number of days a binary is permitted to be old
+// without checking for an update.  This assumes that
+// app.update.checkInstallTime is true.
+pref("app.update.checkInstallTime.days", 2);
+
+// Give the user x seconds to reboot before showing a badge on the hamburger
+// button. default=immediately
+pref("app.update.badgeWaitTime", 0);
+
+// Number of usages of the web console.
+// If this is less than 5, then pasting code into the web console is disabled
+pref("devtools.selfxss.count", 5);
+
 // Betterfox overrides:
 pref('identity.fxaccounts.enabled', true); // Enable firefox sync