mirror of
https://codeberg.org/libreboot/lbmk.git
synced 2026-09-20 13:40:24 +02:00
Leah Rowe
84 lines
4.0 KiB
Diff
84 lines
4.0 KiB
Diff
From 4dcc900e125ca963cd141185588de161e444e836 Mon Sep 17 00:00:00 2001
|
|
From: LibreWolf Developers <noreply@librewolf.net>
|
|
Date: Sun, 6 Sep 2026 10:09:28 +0100
|
|
Subject: [PATCH 07/52] dbus_name.patch
|
|
|
|
---
|
|
toolkit/components/remote/nsDBusRemoteClient.cpp | 6 +++---
|
|
toolkit/components/remote/nsDBusRemoteServer.cpp | 8 ++++----
|
|
2 files changed, 7 insertions(+), 7 deletions(-)
|
|
|
|
diff --git a/toolkit/components/remote/nsDBusRemoteClient.cpp b/toolkit/components/remote/nsDBusRemoteClient.cpp
|
|
index bd1fe5f9cffd..bb68321ba95a 100644
|
|
--- a/toolkit/components/remote/nsDBusRemoteClient.cpp
|
|
+++ b/toolkit/components/remote/nsDBusRemoteClient.cpp
|
|
@@ -73,14 +73,14 @@ bool nsDBusRemoteClient::GetRemoteDestinationName(const char* aProgram,
|
|
mozilla::XREAppData::SanitizeNameForDBus(profileName);
|
|
|
|
aDestinationName =
|
|
- nsPrintfCString("org.mozilla.%s.%s", aProgram, profileName.get());
|
|
+ nsPrintfCString("io.gitlab.%s.%s", aProgram, profileName.get());
|
|
if (aDestinationName.Length() > DBUS_MAXIMUM_NAME_LENGTH)
|
|
aDestinationName.Truncate(DBUS_MAXIMUM_NAME_LENGTH);
|
|
|
|
if (!g_dbus_is_name(aDestinationName.get())) {
|
|
// We don't have a valid busName yet - try to create a default one.
|
|
aDestinationName =
|
|
- nsPrintfCString("org.mozilla.%s.%s", aProgram, "default");
|
|
+ nsPrintfCString("io.gitlab.%s.%s", aProgram, "default");
|
|
if (!g_dbus_is_name(aDestinationName.get())) {
|
|
// We failed completely to get a valid bus name - just quit.
|
|
LOG(" failed to validate profile DBus name");
|
|
@@ -118,7 +118,7 @@ nsresult nsDBusRemoteClient::DoSendDBusCommandLine(const char* aProfile,
|
|
}
|
|
|
|
nsAutoCString remoteInterfaceName;
|
|
- remoteInterfaceName = nsPrintfCString("org.mozilla.%s", appName.get());
|
|
+ remoteInterfaceName = nsPrintfCString("io.gitlab.%s", appName.get());
|
|
|
|
LOG(" DBus destination: %s\n", destinationName.get());
|
|
LOG(" DBus path: %s\n", pathName.get());
|
|
diff --git a/toolkit/components/remote/nsDBusRemoteServer.cpp b/toolkit/components/remote/nsDBusRemoteServer.cpp
|
|
index 226b2dc52874..f2477798aeca 100644
|
|
--- a/toolkit/components/remote/nsDBusRemoteServer.cpp
|
|
+++ b/toolkit/components/remote/nsDBusRemoteServer.cpp
|
|
@@ -25,7 +25,7 @@ static const char* introspect_template =
|
|
"1.0//EN\"\n"
|
|
"\"http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd\">\n"
|
|
"<node>\n"
|
|
- " <interface name=\"org.mozilla.%s\">\n"
|
|
+ " <interface name=\"io.gitlab.%s\">\n"
|
|
" <method name=\"OpenURL\">\n"
|
|
" <arg name=\"url\" direction=\"in\" type=\"ay\"/>\n"
|
|
" </method>\n"
|
|
@@ -35,7 +35,7 @@ static const char* introspect_template =
|
|
bool nsDBusRemoteServer::HandleOpenURL(const gchar* aInterfaceName,
|
|
const gchar* aMethodName,
|
|
Span<const gchar> aParam) {
|
|
- nsPrintfCString ourInterfaceName("org.mozilla.%s", mAppName.get());
|
|
+ nsPrintfCString ourInterfaceName("io.gitlab.%s", mAppName.get());
|
|
|
|
if ((strcmp("OpenURL", aMethodName) != 0) ||
|
|
(strcmp(ourInterfaceName.get(), aInterfaceName) != 0)) {
|
|
@@ -199,7 +199,7 @@ nsresult nsDBusRemoteServer::Startup(const char* aAppName,
|
|
|
|
mozilla::XREAppData::SanitizeNameForDBus(profileName);
|
|
|
|
- nsPrintfCString busName("org.mozilla.%s.%s", mAppName.get(),
|
|
+ nsPrintfCString busName("io.gitlab.%s.%s", mAppName.get(),
|
|
profileName.get());
|
|
if (busName.Length() > DBUS_MAXIMUM_NAME_LENGTH) {
|
|
busName.Truncate(DBUS_MAXIMUM_NAME_LENGTH);
|
|
@@ -207,7 +207,7 @@ nsresult nsDBusRemoteServer::Startup(const char* aAppName,
|
|
|
|
// We don't have a valid busName yet - try to create a default one.
|
|
if (!g_dbus_is_name(busName.get())) {
|
|
- busName = nsPrintfCString("org.mozilla.%s.%s", mAppName.get(), "default");
|
|
+ busName = nsPrintfCString("io.gitlab.%s.%s", mAppName.get(), "default");
|
|
if (!g_dbus_is_name(busName.get())) {
|
|
// We failed completely to get a valid bus name - just quit.
|
|
g_warning("nsDBusRemoteServer: couldn't get a valid bus name!");
|
|
--
|
|
2.47.3
|
|
|