kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-10-28 03:21:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix container detaching

Browse source
This commit is contained in:
Elvis Angelaccio 2019-06-08 13:11:47 +02:00
parent 1bcd478422
commit d886cf3c85
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/global.cpp
View file

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

2
src/global.h
View file

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