yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "Register unique service name when wayland keyboard interface is in use"

Browse source 
This reverts commit e6eee5f970
This commit is contained in:
Andrey Butirsky 2021-04-21 19:58:35 +00:00
parent 1e6c5a7420
commit e74d8ddfc8
1 changed files with 0 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/keyboard_layout.cpp
View file

@ -176,8 +176,6 @@ void KeyboardLayout::notifyLayoutChange()
}
static const QString s_keyboardService = QStringLiteral("org.kde.keyboard");
// this exists because in Plasma 5.21 we want to use a new applet for wayland, but still have the legacy system in use on X11
static const QString s_keyboardService_appletTrigger = QStringLiteral("org.kde.keyboard.wayland");
static const QString s_keyboardObject = QStringLiteral("/Layouts");
KeyboardLayoutDBusInterface::KeyboardLayoutDBusInterface(Xkb *xkb, const KConfigGroup &configGroup, KeyboardLayout *parent)
@ -192,13 +190,11 @@ KeyboardLayoutDBusInterface::KeyboardLayoutDBusInterface(Xkb *xkb, const KConfig
QDBusConnection::sessionBus().registerObject(s_keyboardObject, this, QDBusConnection::ExportAllSlots | QDBusConnection::ExportAllSignals);
QDBusConnection::sessionBus().registerService(s_keyboardService);
QDBusConnection::sessionBus().registerService(s_keyboardService_appletTrigger);
}
KeyboardLayoutDBusInterface::~KeyboardLayoutDBusInterface()
{
QDBusConnection::sessionBus().unregisterService(s_keyboardService);
QDBusConnection::sessionBus().unregisterService(s_keyboardService_appletTrigger);
}
void KeyboardLayoutDBusInterface::switchToNextLayout()