-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix service name used for DBus registration
See: https://bugs.kde.org/show_bug.cgi?id=470246 See: https://invent.kde.org/pim/kleopatra/-/merge_requests/48 Fixes: #34
- Loading branch information
Showing
2 changed files
with
38 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,34 @@ | ||
From 356322cfade88bd82623b5efb63b8de8ed55296a Mon Sep 17 00:00:00 2001 | ||
From: =?UTF-8?q?Timoth=C3=A9e=20Ravier?= <tim@siosm.fr> | ||
Date: Thu, 25 May 2023 12:26:34 +0200 | ||
Subject: [PATCH] Set OrganizationDomain before registering the DBus service | ||
|
||
The OrganizationDomain is used by KDBusAddons to generate the service | ||
name used to register on the session bus so we need to set it up before | ||
we try registering on the bus. | ||
|
||
See: https://bugs.kde.org/show_bug.cgi?id=470246 | ||
See: https://github.com/flathub/org.kde.kleopatra/issues/34 | ||
|
||
CCBUG: 470246 | ||
--- | ||
src/main.cpp | 3 +++ | ||
1 file changed, 3 insertions(+) | ||
|
||
diff --git a/src/main.cpp b/src/main.cpp | ||
index d39455bf..e7cd5af6 100644 | ||
--- a/src/main.cpp | ||
+++ b/src/main.cpp | ||
@@ -109,6 +109,9 @@ int main(int argc, char **argv) | ||
#endif | ||
|
||
KleopatraApplication app(argc, argv); | ||
+ // Set OrganizationDOmain early as this is used to generate the service | ||
+ // name that will be registered on the bus. | ||
+ app.setOrganizationDomain(QStringLiteral("kde.org")); | ||
|
||
STARTUP_TIMING << "Application created"; | ||
/* Create the unique service ASAP to prevent double starts if | ||
-- | ||
2.40.1 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters