Bug 1297520 - For Snap, only install language for system locale. r=na…

…lexander,OlivierTilloy Differential Revision: https://phabricator.services.mozilla.com/D151052
dothq · Sep 12, 2022 · 0ce6d5d · 0ce6d5d
1 parent f4fb662
commit 0ce6d5d
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 2 deletions.
diff --git a/intl/locale/LocaleService.cpp b/intl/locale/LocaleService.cpp
@@ -23,6 +23,9 @@
 #ifdef XP_WIN
 #  include "WinUtils.h"
 #endif
+#ifdef MOZ_WIDGET_GTK
+#  include "mozilla/WidgetUtilsGtk.h"
+#endif
 
 #define INTL_SYSTEM_LOCALES_CHANGED "intl:system-locales-changed"
 
@@ -69,6 +72,8 @@ static void ReadRequestedLocales(nsTArray<nsCString>& aRetVal) {
   const bool isRepack =
 #ifdef XP_WIN
       !mozilla::widget::WinUtils::HasPackageIdentity();
+#elif defined(MOZ_WIDGET_GTK)
+      !widget::IsRunningUnderSnap();
 #else
       true;
 #endif

diff --git a/toolkit/profile/xpcshell/head.js b/toolkit/profile/xpcshell/head.js
@@ -67,7 +67,7 @@ function simulateSnapEnvironment() {
   let env = Cc["@mozilla.org/process/environment;1"].getService(
     Ci.nsIEnvironment
   );
-  env.set("SNAP_NAME", AppConstants.MOZ_APP_NAME);
+  env.set("SNAP_INSTANCE_NAME", AppConstants.MOZ_APP_NAME);
 
   gIsLegacy = true;
 }

diff --git a/widget/gtk/WidgetUtilsGtk.cpp b/widget/gtk/WidgetUtilsGtk.cpp
@@ -105,6 +105,8 @@ void SetLastMousePressEvent(GdkEvent* aEvent) {
   sLastMousePressEvent = event.release();
 }
 
+bool IsRunningUnderSnap() { return g_getenv("SNAP_INSTANCE_NAME") != nullptr; }
+
 bool IsRunningUnderFlatpak() {
   // https://gitlab.gnome.org/GNOME/gtk/-/blob/4300a5c609306ce77cbc8a3580c19201dccd8d13/gdk/gdk.c#L472
   static bool sRunning = [] {

diff --git a/widget/gtk/WidgetUtilsGtk.h b/widget/gtk/WidgetUtilsGtk.h
@@ -39,7 +39,7 @@ GdkEvent* GetLastMousePressEvent();
 
 // Return the snap's instance name, or null when not running as a snap.
 const char* GetSnapInstanceName();
-inline bool IsRunningUnderSnap() { return !!GetSnapInstanceName(); }
+bool IsRunningUnderSnap();
 bool IsRunningUnderFlatpak();
 inline bool IsRunningUnderFlatpakOrSnap() {
   return IsRunningUnderFlatpak() || IsRunningUnderSnap();