Changeset View
Changeset View
Standalone View
Standalone View
src/global.cpp
Show First 20 Lines • Show All 66 Lines • ▼ Show 20 Line(s) | 64 | KRun::run( | |||
---|---|---|---|---|---|
67 | window, | 67 | window, | ||
68 | QApplication::applicationDisplayName(), | 68 | QApplication::applicationDisplayName(), | ||
69 | QApplication::windowIcon().name() | 69 | QApplication::windowIcon().name() | ||
70 | ); | 70 | ); | ||
71 | } | 71 | } | ||
72 | 72 | | |||
73 | bool Dolphin::attachToExistingInstance(const QList<QUrl>& inputUrls, bool openFiles, bool splitView, const QString& preferredService) | 73 | bool Dolphin::attachToExistingInstance(const QList<QUrl>& inputUrls, bool openFiles, bool splitView, const QString& preferredService) | ||
74 | { | 74 | { | ||
75 | if (KWindowSystem::isPlatformWayland()) { | 75 | if (KWindowSystem::isPlatformWayland() || !GeneralSettings::openExternallyCalledFolderInNewTab()) { | ||
76 | // TODO: once Wayland clients can raise or activate themselves remove this conditional | 76 | // TODO: once Wayland clients can raise or activate themselves remove this conditional | ||
77 | return false; | 77 | return false; | ||
78 | } | 78 | } | ||
79 | 79 | | |||
80 | const QStringList services = QDBusConnection::sessionBus().interface()->registeredServiceNames().value(); | 80 | const QStringList services = QDBusConnection::sessionBus().interface()->registeredServiceNames().value(); | ||
81 | 81 | | |||
82 | // Don't match the service without trailing "-" (unique instance) | 82 | // Don't match the service without trailing "-" (unique instance) | ||
83 | const QString pattern = QStringLiteral("org.kde.dolphin-"); | 83 | const QString pattern = QStringLiteral("org.kde.dolphin-"); | ||
▲ Show 20 Lines • Show All 62 Lines • Show Last 20 Lines |