desktop/source/app/officeipcthread.cxx | 10 +++++-----
solenv/flatpak-manifest.in | 2 +-
2 files changed, 6 insertions(+), 6 deletions(-)
New commits:
commit 619fac3527099a684e2c1e871a1aaf5f16e80192
Author: Stephan Bergmann <stephan.bergm...@allotropia.de>
AuthorDate: Sun Mar 2 21:20:36 2025 +0100
Commit: Stephan Bergmann <stephan.bergm...@allotropia.de>
CommitDate: Mon Mar 3 09:42:57 2025 +0100
Use a dedicated de.allotropia.ZetaOfficeIpc0 dbus name
...instead of mis-sharing the name with upstream LO
Change-Id: Ia3308b07feaf3598b8f158ba056638c562b83d5d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/182406
Tested-by: allotropia jenkins <jenk...@allotropia.de>
Reviewed-by: Stephan Bergmann <stephan.bergm...@allotropia.de>
diff --git a/desktop/source/app/officeipcthread.cxx
b/desktop/source/app/officeipcthread.cxx
index 9d342bf35a84..ed25f44fad2f 100644
--- a/desktop/source/app/officeipcthread.cxx
+++ b/desktop/source/app/officeipcthread.cxx
@@ -475,7 +475,7 @@ RequestHandler::Status
DbusIpcThread::enable(rtl::Reference<IpcThread> * thread)
}
for (;;) {
int n = dbus_bus_request_name(
- con.connection, "org.libreoffice.LibreOfficeIpc0",
+ con.connection, "de.allotropia.ZetaOfficeIpc0",
DBUS_NAME_FLAG_DO_NOT_QUEUE, &e);
assert((n == -1) == bool(dbus_error_is_set(&e)));
switch (n) {
@@ -508,9 +508,9 @@ RequestHandler::Status
DbusIpcThread::enable(rtl::Reference<IpcThread> * thread)
char const * argstr = buf.getStr();
DbusMessageHolder msg(
dbus_message_new_method_call(
- "org.libreoffice.LibreOfficeIpc0",
- "/org/libreoffice/LibreOfficeIpc0",
- "org.libreoffice.LibreOfficeIpcIfc0", "Execute"));
+ "de.allotropia.ZetaOfficeIpc0",
+ "/de/allotropia/ZetaOfficeIpc0",
+ "de.allotropia.ZetaOfficeIpcIfc0", "Execute"));
if (msg.message == nullptr) {
SAL_WARN(
"desktop.app", "dbus_message_new_method_call failed");
@@ -573,7 +573,7 @@ void DbusIpcThread::execute()
break;
}
if (!dbus_message_is_method_call(
- msg.message, "org.libreoffice.LibreOfficeIpcIfc0",
+ msg.message, "de.allotropia.ZetaOfficeIpcIfc0",
"Execute"))
{
SAL_INFO("desktop.app", "unknown DBus message ignored");
diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index 6ff7e7835380..e5c1e111a5be 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -848,7 +848,7 @@
"--env=GIO_EXTRA_MODULES=/app/lib/gio/modules",
"--env=JAVA_HOME=/app/jre",
"--env=LIBO_FLATPAK=1",
- "--own-name=org.libreoffice.LibreOfficeIpc0",
+ "--own-name=de.allotropia.ZetaOfficeIpc0",
"--talk-name=org.gtk.vfs.*",
"--talk-name=com.canonical.AppMenu.Registrar"
]
