Changeset View
Changeset View
Standalone View
Standalone View
src/global.cpp
Show First 20 Lines • Show All 76 Lines • ▼ Show 20 Line(s) | 76 | if (KWindowSystem::isPlatformWayland() || inputUrls.isEmpty() || !GeneralSettings::openExternallyCalledFolderInNewTab()) { | |||
---|---|---|---|---|---|
77 | return false; | 77 | return false; | ||
78 | } | 78 | } | ||
79 | 79 | | |||
80 | QVector<QPair<QSharedPointer<QDBusInterface>, QStringList>> dolphinInterfaces; | 80 | QVector<QPair<QSharedPointer<QDBusInterface>, QStringList>> dolphinInterfaces; | ||
81 | if (!preferredService.isEmpty()) { | 81 | if (!preferredService.isEmpty()) { | ||
82 | QSharedPointer<QDBusInterface> preferredInterface( | 82 | QSharedPointer<QDBusInterface> preferredInterface( | ||
83 | new QDBusInterface(preferredService, | 83 | new QDBusInterface(preferredService, | ||
84 | QStringLiteral("/dolphin/Dolphin_1"), | 84 | QStringLiteral("/dolphin/Dolphin_1"), | ||
85 | QString()) // #414402: use empty interface name to prevent QtDBus from caching the interface. | 85 | QStringLiteral("org.kde.dolphin.MainWindow")) | ||
86 | ); | 86 | ); | ||
87 | if (preferredInterface->isValid() && !preferredInterface->lastError().isValid()) { | 87 | if (preferredInterface->isValid() && !preferredInterface->lastError().isValid()) { | ||
88 | dolphinInterfaces.append(qMakePair(preferredInterface, QStringList())); | 88 | dolphinInterfaces.append(qMakePair(preferredInterface, QStringList())); | ||
89 | } | 89 | } | ||
90 | } | 90 | } | ||
91 | 91 | | |||
92 | // Look for dolphin instances among all available dbus services. | 92 | // Look for dolphin instances among all available dbus services. | ||
93 | const QStringList dbusServices = QDBusConnection::sessionBus().interface()->registeredServiceNames().value(); | 93 | const QStringList dbusServices = QDBusConnection::sessionBus().interface()->registeredServiceNames().value(); | ||
▲ Show 20 Lines • Show All 50 Lines • Show Last 20 Lines |