[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[tor-commits] [Git][tpo/applications/tor-browser-build][main] Bug 40924: Customize the remoting name.

Title: GitLab

richard pushed to branch main at The Tor Project / Applications / tor-browser-build

Commits:

  • 1e151f80
    by Pier Angelo Vendrame at 2023-08-17T18:15:47+00:00 
    Bug 40924: Customize the remoting name.

Firefox uses the remote name also as GTK's prgname, which is then shown
in some UI elements like GNOME's Alt-Tab.
We used to customize it with --class and --name on Linux, but these
options are lost when restarting the browser after an update.

On other platforms it should not have evident consequences.

4 changed files:

Changes:

  • projects/browser/RelativeLink/start-browser
    ... ... @@ -365,23 +365,18 @@ cd "${HOME}"
    365 365
    366 366 
     if [ "$show_usage" -eq 1 ]; then
    367 367 
         # Display Firefox help, then our help
    368 
    -    [% IF c("var/tor-browser") %]TOR_CONTROL_PASSWD=${TOR_CONTROL_PASSWD}[% END %] ./[% c('var/exe_name') %] \
    369 
    -        --class "[% c('var/Project_Name') %]" --name "[% c('var/Project_Name') %]" --help 2>/dev/null
    368 
    +    [% IF c("var/tor-browser") %]TOR_CONTROL_PASSWD=${TOR_CONTROL_PASSWD}[% END %] ./[% c('var/exe_name') %] --help 2>/dev/null
    370 369 
         print_usage
    371 370 
     elif [ "$detach" -eq 1 ] ; then
    372 
    -    [% IF c("var/tor-browser") %]TOR_CONTROL_PASSWD=${TOR_CONTROL_PASSWD}[% END %] ./[% c('var/exe_name') %] \
    373 
    -        --class "[% c('var/Project_Name') %]" --name "[% c('var/Project_Name') %]" "${@}" > "$logfile" 2>&1 </dev/null &
    374 
    -    disown "$!"
    371 
    +    [% IF c("var/tor-browser") %]TOR_CONTROL_PASSWD=${TOR_CONTROL_PASSWD}[% END %] ./[% c('var/exe_name') %] "${@}" > "$logfile" 2>&1 </dev/null &
    372 
    +        disown "$!"
    375 373 
     elif [ "$log_output" -eq 1 -a "$show_output" -eq 1 ]; then
    376 
    -    [% IF c("var/tor-browser") %]TOR_CONTROL_PASSWD=${TOR_CONTROL_PASSWD}[% END %] ./[% c('var/exe_name') %] \
    377 
    -        --class "[% c('var/Project_Name') %]" --name "[% c('var/Project_Name') %]" "${@}" 2>&1 </dev/null | \
    374 
    +    [% IF c("var/tor-browser") %]TOR_CONTROL_PASSWD=${TOR_CONTROL_PASSWD}[% END %] ./[% c('var/exe_name') %] "${@}" 2>&1 </dev/null | \
    378 375 
             tee "$logfile"
    379 376 
     elif [ "$show_output" -eq 1 ]; then
    380 
    -    [% IF c("var/tor-browser") %]TOR_CONTROL_PASSWD=${TOR_CONTROL_PASSWD}[% END %] ./[% c('var/exe_name') %] \
    381 
    -        --class "[% c('var/Project_Name') %]" --name "[% c('var/Project_Name') %]" "${@}" < /dev/null
    377 
    +    [% IF c("var/tor-browser") %]TOR_CONTROL_PASSWD=${TOR_CONTROL_PASSWD}[% END %] ./[% c('var/exe_name') %] "${@}" < /dev/null
    382 378 
     else
    383 
    -    [% IF c("var/tor-browser") %]TOR_CONTROL_PASSWD=${TOR_CONTROL_PASSWD}[% END %] ./[% c('var/exe_name') %] \
    384 
    -        --class "[% c('var/Project_Name') %]" --name "[% c('var/Project_Name') %]" "${@}" > "$logfile" 2>&1 </dev/null
    379 
    +    [% IF c("var/tor-browser") %]TOR_CONTROL_PASSWD=${TOR_CONTROL_PASSWD}[% END %] ./[% c('var/exe_name') %] "${@}" > "$logfile" 2>&1 </dev/null
    385 380 
     fi
    386 381
    387 382 
     exit $?

  • projects/browser/RelativeLink/start-browser.desktop
    ... ... @@ -31,4 +31,4 @@ Categories=Network;WebBrowser;Security;
    31 31 
     Exec=sh -c '"$(dirname "$*")"/Browser/start-[% c("var/project-name") %]  --detach || ([ ! -x "$(dirname "$*")"/Browser/start-[% c("var/project-name") %] ] && "$(dirname "$*")"/start-[% c("var/project-name") %] --detach)' dummy %k
    32 32 
     X-[% c("var/ProjectName") %]-ExecShell=./Browser/start-[% c("var/project-name") %] --detach
    33 33 
     Icon=web-browser
    34 
    -StartupWMClass=[% c("var/Project_Name") %]
    34 
    +StartupWMClass=[% c("var/Project_Name_Channel") %]

  • projects/firefox/mozconfig
    ... ... @@ -74,6 +74,8 @@ ac_add_options --[% IF c("var/updater_enabled") %]enable[% ELSE %]disable[% END
    74 74
    75 75 
     mk_add_options MOZ_PARALLEL_BUILD=[% c("num_procs") %]
    76 76
    77 
    +export MOZ_APP_REMOTINGNAME="[% c('var/Project_Name_Channel') %]"
    78 
    +
    77 79 
     export MOZ_INCLUDE_SOURCE_INFO=1
    78 80 
     export MOZ_SOURCE_REPO="[% c('var/gitlab_project') %]"
    79 81 
     export MOZ_SOURCE_CHANGESET=[% c("var/git_commit") %]

  • rbm.conf
    ... ... @@ -107,6 +107,7 @@ var:
    107 107 
         [% SET step = c("step") -%]
    108 108 
         [% c(step, { filename => 'f', output_dir => '/out', norec => {} }) %]
    109 109
    110 
    +  Project_Name_Channel: '[% c("var/Project_Name") %] [% c("var/channel") FILTER ucfirst %]'
    110 111 
       exe_name: firefox
    111 112 
       locale_ja: ja
    112 113 
       locales:
    ... ... @@ -230,6 +231,7 @@ targets:
    230 231 
         var:
    231 232 
           release: 1
    232 233 
           channel: release
    234 
    +      Project_Name_Channel: '[% c("var/Project_Name") %]'
    233 235 
       alpha:
    234 236 
         var:
    235 237 
           alpha: 1

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.torproject.org. Manage all notifications · Help 

    _______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits