mirror of
https://invent.kde.org/system/dolphin
synced 2024-10-28 03:21:56 +00:00
Fix container detaching
This commit is contained in:
parent
1bcd478422
commit
d886cf3c85
|
@ -70,7 +70,7 @@ void Dolphin::openNewWindow(const QList<QUrl> &urls, QWidget *window, const Open
|
|||
);
|
||||
}
|
||||
|
||||
bool Dolphin::attachToExistingInstance(const QList<QUrl>& urls, bool openFiles, bool splitView, const QString& preferredService)
|
||||
bool Dolphin::attachToExistingInstance(const QList<QUrl>& inputUrls, bool openFiles, bool splitView, const QString& preferredService)
|
||||
{
|
||||
if (KWindowSystem::isPlatformWayland()) {
|
||||
// TODO: once Wayland clients can raise or activate themselves remove this conditional
|
||||
|
@ -118,7 +118,8 @@ bool Dolphin::attachToExistingInstance(const QList<QUrl>& urls, bool openFiles,
|
|||
QStringList newUrls;
|
||||
|
||||
// check to see if any instances already have any of the given URLs open
|
||||
for (const QString& url : QUrl::toStringList(urls)) {
|
||||
const auto urls = QUrl::toStringList(inputUrls);
|
||||
for (const QString& url : urls) {
|
||||
bool urlFound = false;
|
||||
for (auto& service: dolphinServices) {
|
||||
QDBusReply<bool> isUrlOpen = service.first->call(QStringLiteral("isUrlOpen"), url);
|
||||
|
|
|
@ -46,7 +46,7 @@ namespace Dolphin {
|
|||
* Attaches URLs to an existing Dolphin instance if possible.
|
||||
* Returns true if URLs were successfully attached
|
||||
*/
|
||||
bool attachToExistingInstance(const QList<QUrl>& urls, bool openFiles, bool splitView, const QString& preferredService = QString());
|
||||
bool attachToExistingInstance(const QList<QUrl>& inputUrls, bool openFiles, bool splitView, const QString& preferredService = QString());
|
||||
|
||||
/**
|
||||
* TODO: Move this somewhere global to all KDE apps, not just Dolphin
|
||||
|
|
Loading…
Reference in a new issue