summaryrefslogtreecommitdiffstats
path: root/src/platformsupport/dbusmenu/qdbusmenuconnection_p.h
diff options
context:
space:
mode:
authorShawn Rutledge <shawn.rutledge@digia.com>2015-02-19 13:47:22 +0100
committerShawn Rutledge <shawn.rutledge@digia.com>2015-02-20 11:41:40 +0000
commit23e9b57e3d261f66168a8a28ccb8e5c886b4841f (patch)
tree4054c503071c814c6fa72c8d5f63ac56804fb449 /src/platformsupport/dbusmenu/qdbusmenuconnection_p.h
parent37ce38daec9c0d73ecb846e1d16709deeef6d79b (diff)
D-Bus system tray: properly check whether StatusNotifierHost available
"org.kde.StatusNotifierWatcher" is just a watcher/helper, whereas the actual systray object is "org.kde.StatusNotifierHost-$PID". The org.kde.StatusNotifierWatcher.IsStatusNotifierHostRegistered property can tell us whether there is an actual system tray. Also renamed the accessor to isStatusNotifierHostRegistered since we are checking for the host, and also because it can be confusing that it's a member of QDBusMenuConnection if the name isn't clear. See also KDE bug 339707 Change-Id: I218c5357b9cc5a62e5cc07abe980893b826f98f4 Reviewed-by: Martin Klapetek <mklapetek@kde.org> Reviewed-by: Jørgen Lind <jorgen.lind@theqtcompany.com> Reviewed-by: Dmitry Shachnev <mitya57@gmail.com>
Diffstat (limited to 'src/platformsupport/dbusmenu/qdbusmenuconnection_p.h')
-rw-r--r--src/platformsupport/dbusmenu/qdbusmenuconnection_p.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/platformsupport/dbusmenu/qdbusmenuconnection_p.h b/src/platformsupport/dbusmenu/qdbusmenuconnection_p.h
index 377999c365..8d230bd3bf 100644
--- a/src/platformsupport/dbusmenu/qdbusmenuconnection_p.h
+++ b/src/platformsupport/dbusmenu/qdbusmenuconnection_p.h
@@ -63,7 +63,7 @@ class QDBusMenuConnection : public QObject
public:
QDBusMenuConnection(QObject *parent = 0);
QDBusConnection connection() const { return m_connection; }
- bool isWatcherRegistered() const { return m_watcherRegistered; }
+ bool isStatusNotifierHostRegistered() const { return m_statusNotifierHostRegistered; }
#ifndef QT_NO_SYSTEMTRAYICON
bool registerTrayIcon(QDBusTrayIcon *item);
bool unregisterTrayIcon(QDBusTrayIcon *item);
@@ -80,7 +80,7 @@ private Q_SLOTS:
private:
QDBusConnection m_connection;
QDBusServiceWatcher *m_dbusWatcher;
- bool m_watcherRegistered;
+ bool m_statusNotifierHostRegistered;
};
QT_END_NAMESPACE