From 32b82d247fc5c346c3eace25645c8d9dc28a96d8 Mon Sep 17 00:00:00 2001 From: Aleix Pol Date: Tue, 24 Nov 2020 19:11:23 +0100 Subject: [PATCH] Define the KAboutData before the KDBusService This way the service annouces itself properly as org.kde.neochat instead of local.neochat. --- src/main.cpp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index 730821e97..521a43f79 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -62,6 +62,14 @@ int main(int argc, char *argv[]) app.setOrganizationName("KDE"); app.setWindowIcon(QIcon(":/assets/img/icon.png")); + KAboutData about(QStringLiteral("neochat"), i18n("Neochat"), QStringLiteral(NEOCHAT_VERSION_STRING), i18n("Matrix client"), KAboutLicense::GPL_V3, i18n("© 2018-2020 Black Hat, 2020 KDE Community")); + about.addAuthor(i18n("Black Hat"), QString(), QStringLiteral("bhat@encom.eu.org")); + about.addAuthor(i18n("Carl Schwan"), QString(), QStringLiteral("carl@carlschwan.eu")); + about.addAuthor(i18n("Tobias Fella"), QString(), QStringLiteral("fella@posteo.de")); + about.setOrganizationDomain("kde.org"); + + KAboutData::setApplicationData(about); + #ifndef Q_OS_ANDROID KDBusService service(KDBusService::Unique); #endif @@ -103,13 +111,6 @@ int main(int argc, char *argv[]) QCommandLineParser parser; parser.setApplicationDescription(i18n("Client for the matrix communication protocol")); - KAboutData about(QStringLiteral("neochat"), i18n("Neochat"), QStringLiteral(NEOCHAT_VERSION_STRING), i18n("Matrix client"), KAboutLicense::GPL_V3, i18n("© 2018-2020 Black Hat, 2020 KDE Community")); - about.addAuthor(i18n("Black Hat"), QString(), QStringLiteral("bhat@encom.eu.org")); - about.addAuthor(i18n("Carl Schwan"), QString(), QStringLiteral("carl@carlschwan.eu")); - about.addAuthor(i18n("Tobias Fella"), QString(), QStringLiteral("fella@posteo.de")); - - KAboutData::setApplicationData(about); - about.setupCommandLine(&parser); parser.process(app); about.processCommandLine(&parser);