summarylogtreecommitdiffstats
path: root/0001-Use-remoting-name-for-GDK-application-names.patch
diff options
context:
space:
mode:
Diffstat (limited to '0001-Use-remoting-name-for-GDK-application-names.patch')
-rw-r--r--0001-Use-remoting-name-for-GDK-application-names.patch37
1 files changed, 19 insertions, 18 deletions
diff --git a/0001-Use-remoting-name-for-GDK-application-names.patch b/0001-Use-remoting-name-for-GDK-application-names.patch
index 165a532f470..ceac9da65b4 100644
--- a/0001-Use-remoting-name-for-GDK-application-names.patch
+++ b/0001-Use-remoting-name-for-GDK-application-names.patch
@@ -9,12 +9,12 @@ Subject: [PATCH] Use remoting name for GDK application names
2 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp
-index 984b998133bd..b6c9f013940c 100644
+index 0828400952..f5b941a37d 100644
--- a/toolkit/xre/nsAppRunner.cpp
+++ b/toolkit/xre/nsAppRunner.cpp
-@@ -3746,11 +3746,7 @@ int XREMain::XRE_mainStartup(bool* aExitFlag) {
+@@ -3703,11 +3703,7 @@ int XREMain::XRE_mainStartup(bool* aExitFlag) {
// consistently.
-
+
// Set program name to the one defined in application.ini.
- {
- nsAutoCString program(gAppData->name);
@@ -22,11 +22,11 @@ index 984b998133bd..b6c9f013940c 100644
- g_set_prgname(program.get());
- }
+ g_set_prgname(gAppData->remotingName);
-
+
// Initialize GTK here for splash.
-
+
diff --git a/widget/gtk/nsAppShell.cpp b/widget/gtk/nsAppShell.cpp
-index 0daa78fdbbad..49038d0bb1c8 100644
+index 163a93e2d1..0435506029 100644
--- a/widget/gtk/nsAppShell.cpp
+++ b/widget/gtk/nsAppShell.cpp
@@ -24,6 +24,7 @@
@@ -37,19 +37,20 @@ index 0daa78fdbbad..49038d0bb1c8 100644
#include "ScreenHelperGTK.h"
#include "HeadlessScreenHelper.h"
#include "mozilla/widget/ScreenManager.h"
-@@ -175,10 +176,8 @@ nsresult 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);
+@@ -178,10 +179,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);
+ }
}
}
-
---
+
+--
2.24.0