boklm pushed to branch tor-browser-115.7.0esr-13.0-1 at The Tor Project / Applications / Tor Browser

Commits: 6292bbc9 by Nicolas Vigier at 2024-01-25T10:26:11+01:00 fixup! Bug 41668: Tweaks to the Base Browser updater for Tor Browser

Bug 42293: Don't disable updater when run by torbrowser-launcher flatpak

When the TORBROWSER_LAUNCHER environment variable is set (which is set by torbrowser-launcher since version 0.3.7) we assume that Tor Browser is not installed by a Flatkpak. Although torbrowser-launcher itself can be installed by a Flatpak, this should not prevent the updater from working.

- - - - -

1 changed file:

- widget/gtk/WidgetUtilsGtk.cpp

Changes:

===================================== widget/gtk/WidgetUtilsGtk.cpp ===================================== @@ -138,6 +138,11 @@ void SetLastMousePressEvent(GdkEvent* aEvent) { bool IsRunningUnderSnap() { return !!GetSnapInstanceName(); }

bool IsRunningUnderFlatpak() { + // tor-browser#42293: Don't disable updater when run by torbrowser-launcher flatpak + const char* torbrowserLauncher = g_getenv("TORBROWSER_LAUNCHER"); + if (torbrowserLauncher) { + return false; + } // https://gitlab.gnome.org/GNOME/gtk/-/blob/4300a5c609306ce77cbc8a3580c19201dc... static bool sRunning = [] { return g_file_test("/.flatpak-info", G_FILE_TEST_EXISTS);

View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/6292bbc9...