Verified Commit 6a341cfc authored by boklm's avatar boklm Committed by Pier Angelo Vendrame
Browse files

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.
parent 36e7a1af

widget/gtk/WidgetUtilsGtk.cpp

+5 −0
Original line number Diff line number Diff line
@@ -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/4300a5c609306ce77cbc8a3580c19201dccd8d13/gdk/gdk.c#L472

  static bool sRunning = [] {

    return g_file_test("/.flatpak-info", G_FILE_TEST_EXISTS);