From c6da593dc9af07c7b28e96a9c40dcb6e534db4ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= Date: Thu, 15 May 2014 08:44:06 +0200 Subject: [PATCH] Do not register dbus service org.kde.kwin.Scripting Just use org.kde.KWin - there's object and interface to differentiate. REVIEW: 118139 --- scripting/scripting.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/scripting/scripting.cpp b/scripting/scripting.cpp index 0ee864ae6c..17acf94ba0 100644 --- a/scripting/scripting.cpp +++ b/scripting/scripting.cpp @@ -602,7 +602,6 @@ KWin::Scripting::Scripting(QObject *parent) { init(); QDBusConnection::sessionBus().registerObject(QStringLiteral("/Scripting"), this, QDBusConnection::ExportScriptableContents | QDBusConnection::ExportScriptableInvokables); - QDBusConnection::sessionBus().registerService(QStringLiteral("org.kde.kwin.Scripting")); connect(Workspace::self(), SIGNAL(configChanged()), SLOT(start())); connect(Workspace::self(), SIGNAL(workspaceInitialized()), SLOT(start())); } @@ -782,7 +781,6 @@ int KWin::Scripting::loadDeclarativeScript(const QString& filePath, const QStrin KWin::Scripting::~Scripting() { QDBusConnection::sessionBus().unregisterObject(QStringLiteral("/Scripting")); - QDBusConnection::sessionBus().unregisterService(QStringLiteral("org.kde.kwin.Scripting")); s_self = nullptr; }