diff options
Diffstat (limited to 'src/dbusinterface.cpp')
| -rw-r--r-- | src/dbusinterface.cpp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/dbusinterface.cpp b/src/dbusinterface.cpp index 7e453f72a..e4f647f73 100644 --- a/src/dbusinterface.cpp +++ b/src/dbusinterface.cpp @@ -9,6 +9,7 @@ #include "dolphin_generalsettings.h" #include <KPropertiesDialog> +#include <KWindowSystem> #include <QApplication> #include <QDBusConnection> @@ -20,17 +21,19 @@ DBusInterface::DBusInterface() : { QDBusConnection::sessionBus().registerObject(QStringLiteral("/org/freedesktop/FileManager1"), this, QDBusConnection::ExportScriptableContents | QDBusConnection::ExportAdaptors); - QDBusConnection::sessionBus().interface()->registerService(QStringLiteral("org.freedesktop.FileManager1"), - QDBusConnectionInterface::QueueService); + QDBusConnectionInterface *sessionInterface = QDBusConnection::sessionBus().interface(); + if (sessionInterface) { + sessionInterface->registerService(QStringLiteral("org.freedesktop.FileManager1"), QDBusConnectionInterface::QueueService); + } } void DBusInterface::ShowFolders(const QStringList& uriList, const QString& startUpId) { - Q_UNUSED(startUpId) const QList<QUrl> urls = Dolphin::validateUris(uriList); if (urls.isEmpty()) { return; } + KWindowSystem::setCurrentXdgActivationToken(startUpId); const auto serviceName = isDaemon() ? QString() : QStringLiteral("org.kde.dolphin-%1").arg(QCoreApplication::applicationPid()); if(!Dolphin::attachToExistingInstance(urls, false, GeneralSettings::splitView(), serviceName)) { Dolphin::openNewWindow(urls); @@ -39,11 +42,11 @@ void DBusInterface::ShowFolders(const QStringList& uriList, const QString& start void DBusInterface::ShowItems(const QStringList& uriList, const QString& startUpId) { - Q_UNUSED(startUpId) const QList<QUrl> urls = Dolphin::validateUris(uriList); if (urls.isEmpty()) { return; } + KWindowSystem::setCurrentXdgActivationToken(startUpId); const auto serviceName = isDaemon() ? QString() : QStringLiteral("org.kde.dolphin-%1").arg(QCoreApplication::applicationPid()); if(!Dolphin::attachToExistingInstance(urls, true, GeneralSettings::splitView(), serviceName)) { Dolphin::openNewWindow(urls, nullptr, Dolphin::OpenNewWindowFlag::Select); @@ -52,9 +55,9 @@ void DBusInterface::ShowItems(const QStringList& uriList, const QString& startUp void DBusInterface::ShowItemProperties(const QStringList& uriList, const QString& startUpId) { - Q_UNUSED(startUpId) const QList<QUrl> urls = Dolphin::validateUris(uriList); if (!urls.isEmpty()) { + KWindowSystem::setCurrentXdgActivationToken(startUpId); KPropertiesDialog::showDialog(urls); } } |