This is an automated email from the git hooks/post-receive script. pierov pushed a commit to branch tor-browser-102.4.0esr-12.0-1 in repository tor-browser. The following commit(s) were added to refs/heads/tor-browser-102.4.0esr-12.0-1 by this push: new 225e9a200cc1 fixup! Bug 10760: Integrate TorButton to TorBrowser core 225e9a200cc1 is described below commit 225e9a200cc154523b52ff580ce0d6b0d0b8f437 Author: Pier Angelo Vendrame <pierov@torproject.org> AuthorDate: Thu Oct 20 11:54:10 2022 +0200 fixup! Bug 10760: Integrate TorButton to TorBrowser core Bug 41294: Bookmarks manager broken in 12.0a2 on MacOS --- browser/base/content/hiddenWindowMac.xhtml | 4 ++++ browser/base/content/pageinfo/pageInfo.xhtml | 6 ++++++ browser/components/places/content/places.xhtml | 3 +++ browser/components/shell/content/setDesktopBackground.xhtml | 6 ++++++ 4 files changed, 19 insertions(+) diff --git a/browser/base/content/hiddenWindowMac.xhtml b/browser/base/content/hiddenWindowMac.xhtml index c27d394d3707..b272a076bb30 100644 --- a/browser/base/content/hiddenWindowMac.xhtml +++ b/browser/base/content/hiddenWindowMac.xhtml @@ -8,6 +8,10 @@ <?xml-stylesheet href="chrome://browser/skin/webRTC-menubar-indicator.css" type="text/css"?> +<!DOCTYPE window [ +#include browser-doctype.inc +]> + <window id="main-window" xmlns:html="http://www.w3.org/1999/xhtml" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" diff --git a/browser/base/content/pageinfo/pageInfo.xhtml b/browser/base/content/pageinfo/pageInfo.xhtml index 4fe7f4909180..b2b09f753902 100644 --- a/browser/base/content/pageinfo/pageInfo.xhtml +++ b/browser/base/content/pageinfo/pageInfo.xhtml @@ -6,6 +6,12 @@ <?xml-stylesheet href="chrome://browser/content/pageinfo/pageInfo.css" type="text/css"?> <?xml-stylesheet href="chrome://browser/skin/pageInfo.css" type="text/css"?> +<!DOCTYPE window [ +#ifdef XP_MACOSX +#include ../browser-doctype.inc +#endif +]> + <window id="main-window" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml" diff --git a/browser/components/places/content/places.xhtml b/browser/components/places/content/places.xhtml index e19a58029828..f55d813664f6 100644 --- a/browser/components/places/content/places.xhtml +++ b/browser/components/places/content/places.xhtml @@ -18,6 +18,9 @@ <!DOCTYPE window [ <!ENTITY % editMenuOverlayDTD SYSTEM "chrome://global/locale/editMenuOverlay.dtd"> %editMenuOverlayDTD; +#ifdef XP_MACOSX +#include ../../../base/content/browser-doctype.inc +#endif ]> <window id="places" diff --git a/browser/components/shell/content/setDesktopBackground.xhtml b/browser/components/shell/content/setDesktopBackground.xhtml index a7d4ced792b6..ef102450ff2c 100644 --- a/browser/components/shell/content/setDesktopBackground.xhtml +++ b/browser/components/shell/content/setDesktopBackground.xhtml @@ -7,6 +7,12 @@ <?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?> <?xml-stylesheet href="chrome://browser/skin/setDesktopBackground.css" type="text/css"?> +<!DOCTYPE window [ +#ifdef XP_MACOSX +#include ../../../base/content/browser-doctype.inc +#endif +]> + <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml" windowtype="Shell:SetDesktopBackground" -- To stop receiving notification emails like this one, please contact the administrator of this repository.