From: Mike Hommey <mh@glandium.org>
Date: Sun, 2 Sep 2018 22:37:40 +0000 (+0900)
Subject: Use remoting name for call to gdk_set_program_class
X-Git-Tag: archive/raspbian/60.4.0esr-1+rpi1^2~1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=a6596bd2d89ac4d0eaeb1604aada5be110a99b40;p=firefox-esr.git

Use remoting name for call to gdk_set_program_class

Closes: #907574

Gbp-Pq: Topic debian-hacks
Gbp-Pq: Name Use-remoting-name-for-call-to-gdk_set_program_class.patch
---

diff --git a/widget/gtk/nsAppShell.cpp b/widget/gtk/nsAppShell.cpp
index c81dac529b4..f460a970755 100644
--- a/widget/gtk/nsAppShell.cpp
+++ b/widget/gtk/nsAppShell.cpp
@@ -23,6 +23,7 @@
 #include "WakeLockListener.h"
 #endif
 #include "gfxPlatform.h"
+#include "nsAppRunner.h"
 #include "ScreenHelperGTK.h"
 #include "HeadlessScreenHelper.h"
 #include "mozilla/widget/ScreenManager.h"
@@ -182,10 +183,8 @@ nsAppShell::Init()
         // option when program uses gdk_set_program_class().
         //
         // See https://bugzilla.gnome.org/show_bug.cgi?id=747634
-        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);
         }
     }