diff options
Diffstat (limited to '0001-Use-remoting-name-for-GDK-application-names.patch')
| -rw-r--r-- | 0001-Use-remoting-name-for-GDK-application-names.patch | 43 |
1 files changed, 23 insertions, 20 deletions
diff --git a/0001-Use-remoting-name-for-GDK-application-names.patch b/0001-Use-remoting-name-for-GDK-application-names.patch index 8cc3786..73ae042 100644 --- a/0001-Use-remoting-name-for-GDK-application-names.patch +++ b/0001-Use-remoting-name-for-GDK-application-names.patch @@ -1,19 +1,18 @@ -From 1cab10b39cfda068100cab8c598f1ca0f50e4131 Mon Sep 17 00:00:00 2001 -Message-Id: <1cab10b39cfda068100cab8c598f1ca0f50e4131.1553597287.git.jan.steffens@gmail.com> +From 5025aab61517c8608b555ba929c61eb0706bd6bd Mon Sep 17 00:00:00 2001 From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com> Date: Mon, 25 Mar 2019 20:30:11 +0100 Subject: [PATCH] Use remoting name for GDK application names --- - toolkit/xre/nsAppRunner.cpp | 6 +----- - widget/gtk/nsAppShell.cpp | 7 +++---- - 2 files changed, 4 insertions(+), 9 deletions(-) + toolkit/xre/nsAppRunner.cpp | 6 +----- + widget/gtk/nsAppShell.cpp | 11 ++++------- + 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp -index 0b808ef215f06..28911c0ffeaec 100644 +index da8289200e72..452195b146f3 100644 --- a/toolkit/xre/nsAppRunner.cpp +++ b/toolkit/xre/nsAppRunner.cpp -@@ -3728,11 +3728,7 @@ int XREMain::XRE_mainStartup(bool* aExitFlag) { +@@ -3785,11 +3785,7 @@ int XREMain::XRE_mainStartup(bool* aExitFlag) { // consistently. // Set program name to the one defined in application.ini. @@ -27,7 +26,7 @@ index 0b808ef215f06..28911c0ffeaec 100644 // Initialize GTK here for splash. diff --git a/widget/gtk/nsAppShell.cpp b/widget/gtk/nsAppShell.cpp -index 0686ff814916b..ae4a4ea55f420 100644 +index 163a93e2d1a4..4b6d45217671 100644 --- a/widget/gtk/nsAppShell.cpp +++ b/widget/gtk/nsAppShell.cpp @@ -24,6 +24,7 @@ @@ -38,19 +37,23 @@ index 0686ff814916b..ae4a4ea55f420 100644 #include "ScreenHelperGTK.h" #include "HeadlessScreenHelper.h" #include "mozilla/widget/ScreenManager.h" -@@ -171,10 +172,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); +@@ -175,13 +176,9 @@ nsresult nsAppShell::Init() { + // See https://bugzilla.gnome.org/show_bug.cgi?id=747634 + // + // Only bother doing this for the parent process, since it's the one +- // 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()); ++ // creating top-level windows. ++ if (gAppData) { ++ gdk_set_program_class(gAppData->remotingName); + } } } - -- -2.21.0 +2.26.1 |