[tbb-commits] [builders/tor-browser-build] branch master updated: Bug 41015: Add --name parameter to correctly setup WM_CLASS when running as native Wayland client

gitolite role git at cupani.torproject.org
Tue Jun 7 07:55:43 UTC 2022


This is an automated email from the git hooks/post-receive script.

boklm pushed a commit to branch master
in repository builders/tor-browser-build.

The following commit(s) were added to refs/heads/master by this push:
     new 13e1fa1  Bug 41015: Add --name parameter to correctly setup WM_CLASS when running as native Wayland client
13e1fa1 is described below

commit 13e1fa1d3cfaeeef58ec344337a367528807094f
Author: dragjkngj <goldenhashtag at hotmail.com>
AuthorDate: Mon Jun 6 03:51:06 2022 +0000

    Bug 41015: Add --name parameter to correctly setup WM_CLASS when running as native Wayland client
---
 .../tor-browser/RelativeLink/start-tor-browser     | 23 +++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/projects/tor-browser/RelativeLink/start-tor-browser b/projects/tor-browser/RelativeLink/start-tor-browser
index cd70765..d7b4b05 100755
--- a/projects/tor-browser/RelativeLink/start-tor-browser
+++ b/projects/tor-browser/RelativeLink/start-tor-browser
@@ -344,26 +344,35 @@ cd "${HOME}"
 
 # We pass all additional command-line arguments we get to Firefox.
 #
-# The --class parameter was added to fix bug 11102.
+# The --class parameter was added to fix bug 11102 (X11).
+# The --name parameter was added to fix bug 41015 (Wayland).
+# --class and --name parameters are used to make sure WM_CLASS is set
+# up correctly, to identify itself from plain Firefox windows (and
+# prevent from mixing up with them).
 
 if [ "$show_usage" -eq 1 ]; then
     # Display Firefox help, then our help
-    TOR_CONTROL_PASSWD=${TOR_CONTROL_PASSWD} ./firefox --class "Tor Browser" \
+    TOR_CONTROL_PASSWD=${TOR_CONTROL_PASSWD} ./firefox \
+        --class "Tor Browser" --name "Tor Browser" \
         -profile TorBrowser/Data/Browser/profile.default --help 2>/dev/null
     tbb_usage
 elif [ "$detach" -eq 1 ] ; then
-    TOR_CONTROL_PASSWD=${TOR_CONTROL_PASSWD} ./firefox --class "Tor Browser" \
-       -profile TorBrowser/Data/Browser/profile.default "${@}" > "$logfile" 2>&1 </dev/null &
+    TOR_CONTROL_PASSWD=${TOR_CONTROL_PASSWD} ./firefox \
+        --class "Tor Browser" --name "Tor Browser" \
+        -profile TorBrowser/Data/Browser/profile.default "${@}" > "$logfile" 2>&1 </dev/null &
     disown "$!"
 elif [ "$log_output" -eq 1 -a "$show_output" -eq 1 ]; then
-    TOR_CONTROL_PASSWD=${TOR_CONTROL_PASSWD} ./firefox --class "Tor Browser" \
+    TOR_CONTROL_PASSWD=${TOR_CONTROL_PASSWD} ./firefox \
+        --class "Tor Browser" --name "Tor Browser" \
         -profile TorBrowser/Data/Browser/profile.default "${@}" 2>&1 </dev/null | \
         tee "$logfile"
 elif [ "$show_output" -eq 1 ]; then
-    TOR_CONTROL_PASSWD=${TOR_CONTROL_PASSWD} ./firefox --class "Tor Browser" \
+    TOR_CONTROL_PASSWD=${TOR_CONTROL_PASSWD} ./firefox \
+        --class "Tor Browser" --name "Tor Browser" \
         -profile TorBrowser/Data/Browser/profile.default "${@}" < /dev/null
 else
-    TOR_CONTROL_PASSWD=${TOR_CONTROL_PASSWD} ./firefox --class "Tor Browser" \
+    TOR_CONTROL_PASSWD=${TOR_CONTROL_PASSWD} ./firefox \
+        --class "Tor Browser" --name "Tor Browser" \
         -profile TorBrowser/Data/Browser/profile.default "${@}" > "$logfile" 2>&1 </dev/null
 fi
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.


More information about the tbb-commits mailing list