From fa806d48dafec0c47141381740a5d7604293d32d Mon Sep 17 00:00:00 2001 From: Elvis Angelaccio Date: Tue, 24 Dec 2019 18:28:26 +0100 Subject: 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 --- src/dbusinterface.h | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'src/dbusinterface.h') diff --git a/src/dbusinterface.h b/src/dbusinterface.h index baf804f68..391916d62 100644 --- a/src/dbusinterface.h +++ b/src/dbusinterface.h @@ -32,6 +32,19 @@ public: Q_SCRIPTABLE void ShowFolders(const QStringList& uriList, const QString& startUpId); Q_SCRIPTABLE void ShowItems(const QStringList& uriList, const QString& startUpId); Q_SCRIPTABLE void ShowItemProperties(const QStringList& uriList, const QString& startUpId); + + /** + * Set whether this interface has been created by dolphin --deamon. + */ + void setAsDaemon(); + + /** + * @return Whether this interface has been created by dolphin --deamon. + */ + bool isDaemon() const; + +private: + bool m_isDaemon = false; }; #endif // DBUSINTERFACE_H -- cgit v1.3