mirror of
https://codeberg.org/librewolf/source.git
synced 2024-12-23 06:04:05 -05:00
98 lines
4.8 KiB
Diff
98 lines
4.8 KiB
Diff
diff --git a/toolkit/components/remote/nsDBusRemoteClient.cpp b/toolkit/components/remote/nsDBusRemoteClient.cpp
|
|
index 68c67c3482eb..914bae09a227 100644
|
|
--- a/toolkit/components/remote/nsDBusRemoteClient.cpp
|
|
+++ b/toolkit/components/remote/nsDBusRemoteClient.cpp
|
|
@@ -97,7 +97,7 @@ 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);
|
|
|
|
@@ -111,7 +111,7 @@ bool nsDBusRemoteClient::GetRemoteDestinationName(const char* aProgram,
|
|
if (!sDBusValidateBusName(aDestinationName.get(), nullptr)) {
|
|
// 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 (!sDBusValidateBusName(aDestinationName.get(), nullptr)) {
|
|
// We failed completelly to get a valid bus name - just quit
|
|
// to prevent crash at dbus_bus_request_name().
|
|
@@ -139,7 +139,7 @@ nsresult nsDBusRemoteClient::DoSendDBusCommandLine(const char* aProgram,
|
|
}
|
|
|
|
nsAutoCString pathName;
|
|
- pathName = nsPrintfCString("/org/mozilla/%s/Remote", appName.get());
|
|
+ pathName = nsPrintfCString("/io/gitlab/%s/Remote", appName.get());
|
|
|
|
static auto sDBusValidatePathName = (bool (*)(const char*, DBusError*))dlsym(
|
|
RTLD_DEFAULT, "dbus_validate_path");
|
|
@@ -150,7 +150,7 @@ nsresult nsDBusRemoteClient::DoSendDBusCommandLine(const char* aProgram,
|
|
}
|
|
|
|
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 34167177d972..6b5c3e036b21 100644
|
|
--- a/toolkit/components/remote/nsDBusRemoteServer.cpp
|
|
+++ b/toolkit/components/remote/nsDBusRemoteServer.cpp
|
|
@@ -30,7 +30,7 @@ static const char* introspect_template =
|
|
" <arg name=\"data\" direction=\"out\" type=\"s\"/>\n"
|
|
" </method>\n"
|
|
" </interface>\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"
|
|
@@ -63,7 +63,7 @@ DBusHandlerResult nsDBusRemoteServer::OpenURL(DBusMessage* msg) {
|
|
&commandLine, &length, DBUS_TYPE_INVALID) ||
|
|
length == 0) {
|
|
nsAutoCString errorMsg;
|
|
- errorMsg = nsPrintfCString("org.mozilla.%s.Error", mAppName.get());
|
|
+ errorMsg = nsPrintfCString("io.gitlab.%s.Error", mAppName.get());
|
|
reply = dbus_message_new_error(msg, errorMsg.get(), "Wrong argument");
|
|
} else {
|
|
guint32 timestamp = gtk_get_current_event_time();
|
|
@@ -93,7 +93,7 @@ DBusHandlerResult nsDBusRemoteServer::HandleDBusMessage(
|
|
}
|
|
|
|
nsAutoCString ourInterfaceName;
|
|
- ourInterfaceName = nsPrintfCString("org.mozilla.%s", mAppName.get());
|
|
+ ourInterfaceName = nsPrintfCString("io.gitlab.%s", mAppName.get());
|
|
|
|
if ((strcmp("OpenURL", method) == 0) &&
|
|
(strcmp(ourInterfaceName.get(), iface) == 0)) {
|
|
@@ -154,7 +154,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);
|
|
@@ -167,7 +167,7 @@ nsresult nsDBusRemoteServer::Startup(const char* aAppName,
|
|
|
|
// We don't have a valid busName yet - try to create a default one.
|
|
if (!sDBusValidateBusName(busName.get(), nullptr)) {
|
|
- busName = nsPrintfCString("org.mozilla.%s.%s", mAppName.get(), "default");
|
|
+ busName = nsPrintfCString("io.gitlab.%s.%s", mAppName.get(), "default");
|
|
if (!sDBusValidateBusName(busName.get(), nullptr)) {
|
|
// We failed completelly to get a valid bus name - just quit
|
|
// to prevent crash at dbus_bus_request_name().
|
|
@@ -186,7 +186,7 @@ nsresult nsDBusRemoteServer::Startup(const char* aAppName,
|
|
return NS_ERROR_FAILURE;
|
|
}
|
|
|
|
- mPathName = nsPrintfCString("/org/mozilla/%s/Remote", mAppName.get());
|
|
+ mPathName = nsPrintfCString("/io/gitlab/%s/Remote", mAppName.get());
|
|
static auto sDBusValidatePathName = (bool (*)(const char*, DBusError*))dlsym(
|
|
RTLD_DEFAULT, "dbus_validate_path");
|
|
if (!sDBusValidatePathName ||
|