From 65f099cba1e42e6acb0f64cb6327083a26f10f34 Mon Sep 17 00:00:00 2001 From: "Jan Alexander Steffens (heftig)" Date: Fri, 22 Mar 2019 22:37:22 +0100 Subject: [PATCH] qtui: Set desktop file name The XCB platform plugin defaults the WM class to the executable name, which already matches our desktop file name. Unfortunately, the Wayland platform plugin prepends the inverted organization domain, resulting in an app ID of "org.quassel-irc.quasselclient", thus breaking the association. Set the desktop file name explicitly so the Wayland platform doesn't get confused. --- src/main/monoapplication.cpp | 6 +++++- src/qtui/qtuiapplication.cpp | 3 +++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/main/monoapplication.cpp b/src/main/monoapplication.cpp index daee3165..aa54ddf4 100644 --- a/src/main/monoapplication.cpp +++ b/src/main/monoapplication.cpp @@ -30,7 +30,11 @@ class InternalPeer; MonolithicApplication::MonolithicApplication(int& argc, char** argv) : QtUiApplication(argc, argv) -{} +{ +#if QT_VERSION >= 0x050700 + QGuiApplication::setDesktopFileName(Quassel::buildInfo().applicationName); +#endif +} void MonolithicApplication::init() { diff --git a/src/qtui/qtuiapplication.cpp b/src/qtui/qtuiapplication.cpp index 4685d51c..b7e8e8c5 100644 --- a/src/qtui/qtuiapplication.cpp +++ b/src/qtui/qtuiapplication.cpp @@ -36,6 +36,9 @@ QtUiApplication::QtUiApplication(int& argc, char** argv) #if QT_VERSION >= 0x050600 QGuiApplication::setFallbackSessionManagementEnabled(false); #endif +#if QT_VERSION >= 0x050700 + QGuiApplication::setDesktopFileName(Quassel::buildInfo().clientApplicationName); +#endif } void QtUiApplication::init() -- 2.20.1