diff options
| author | Elvis Angelaccio <[email protected]> | 2019-12-24 18:28:26 +0100 |
|---|---|---|
| committer | Elvis Angelaccio <[email protected]> | 2020-03-16 22:38:40 +0100 |
| commit | fa806d48dafec0c47141381740a5d7604293d32d (patch) | |
| tree | e1813504cbb2d4b1d9cfe0334e50863b829936f4 /src/global.h | |
| parent | 405dd624fb6b708eea8ec82ef913fe820c51c654 (diff) | |
Exclude daemonized processes from Dolphin::attachToExistingInstance()
Summary:
`dolphin --daemon` does not have the `/dolphin/Dolphin_1` dbus path,
because it doesn't have any DolphinMainWindow.
Instead of working around this issue (as we did in D21666 and D25510),
just exclude these processes from the list of dbus instances checked by
`Dolphin::attachToExistingInstance()`.
CCBUG: 408244
Test Plan: Same test plan as in D21666 and D25510
Reviewers: #dolphin
Subscribers: kfm-devel
Tags: #dolphin
Differential Revision: https://phabricator.kde.org/D26213
Diffstat (limited to 'src/global.h')
| -rw-r--r-- | src/global.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/global.h b/src/global.h index f203615f1..7ee564581 100644 --- a/src/global.h +++ b/src/global.h @@ -45,7 +45,9 @@ namespace Dolphin { /** * Attaches URLs to an existing Dolphin instance if possible. - * Returns true if URLs were successfully attached + * If @p preferredService is a valid dbus service, it will be tried first. + * @p preferredService needs to support the org.kde.dolphin.MainWindow dbus interface with the /dolphin/Dolphin_1 path. + * Returns true if the URLs were successfully attached. */ bool attachToExistingInstance(const QList<QUrl>& inputUrls, bool openFiles, bool splitView, const QString& preferredService = QString()); |