Do not register dbus service org.kde.kwin.Scripting

Just use org.kde.KWin - there's object and interface to differentiate.

REVIEW: 118139
This commit is contained in:
Martin Gräßlin 2014-05-15 08:44:06 +02:00
parent bef0bf8a4f
commit c6da593dc9

View file

@ -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;
}