1 files changed, 42 insertions, 0 deletions
diff --git a/debian/patches/debian-hacks/Use-remoting-name-for-call-to-gdk_set_program_class.patch b/debian/patches/debian-hacks/Use-remoting-name-for-call-to-gdk_set_program_class.patch
new file mode 100644
index 0000000000..cc650d0350
--- /dev/null
+++ b/debian/patches/debian-hacks/Use-remoting-name-for-call-to-gdk_set_program_class.patch
@@ -0,0 +1,42 @@
+From: Mike Hommey <mh@glandium.org>
+Date: Mon, 3 Sep 2018 07:37:40 +0900
+Subject: Use remoting name for call to gdk_set_program_class
+
+Closes: #907574
+---
+ widget/gtk/nsAppShell.cpp | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/widget/gtk/nsAppShell.cpp b/widget/gtk/nsAppShell.cpp
+index 24bdd50..0de7757 100644
+--- a/widget/gtk/nsAppShell.cpp
++++ b/widget/gtk/nsAppShell.cpp
+@@ -10,6 +10,7 @@
+ #include <fcntl.h>
+ #include <errno.h>
+ #include <gdk/gdk.h>
++#include "mozilla/XREAppData.h"
+ #include "nsAppShell.h"
+ #include "nsWindow.h"
+ #include "mozilla/Logging.h"
+@@ -24,6 +25,7 @@
+ #  include "WakeLockListener.h"
+ #endif
+ #include "gfxPlatform.h"
++#include "nsAppRunner.h"
+ #include "ScreenHelperGTK.h"
+ #include "HeadlessScreenHelper.h"
+ #include "mozilla/widget/ScreenManager.h"
+@@ -156,10 +158,8 @@ nsresult nsAppShell::Init() {
+       // creating top-level windows. (At this point, a child process hasn't
+       // received the list of registered chrome packages, so the
+       // GetBrandShortName call would fail anyway.)
+-      nsAutoString brandName;
+-      mozilla::widget::WidgetUtils::GetBrandShortName(brandName);
+-      if (!brandName.IsEmpty()) {
+-        gdk_set_program_class(NS_ConvertUTF16toUTF8(brandName).get());
++      if (gAppData) {
++        gdk_set_program_class(gAppData->remotingName);
+       }
+     }
+   }