2 files changed, 7 insertions, 7 deletions
diff --git a/src/platformsupport/dbusmenu/qdbusmenuconnection.cpp b/src/platformsupport/dbusmenu/qdbusmenuconnection.cpp
index a8211f63ce..73793d7497 100644
--- a/src/platformsupport/dbusmenu/qdbusmenuconnection.cpp
+++ b/src/platformsupport/dbusmenu/qdbusmenuconnection.cpp
@@ -63,14 +63,14 @@ QDBusMenuConnection::QDBusMenuConnection(QObject *parent)
     : QObject(parent)
     , m_connection(QDBusConnection::sessionBus())
     , m_dbusWatcher(new QDBusServiceWatcher(StatusNotifierWatcherService, m_connection, QDBusServiceWatcher::WatchForRegistration, this))
-    , m_watcherRegistered(false)
+    , m_statusNotifierHostRegistered(false)
 {
 #ifndef QT_NO_SYSTEMTRAYICON
-    // Start monitoring if any known tray-related services are registered.
-    if (m_connection.interface()->isServiceRegistered(StatusNotifierWatcherService))
-        m_watcherRegistered = true;
+    QDBusInterface systrayHost(StatusNotifierWatcherService, StatusNotifierWatcherPath, StatusNotifierWatcherService, m_connection);
+    if (systrayHost.isValid() && systrayHost.property("IsStatusNotifierHostRegistered").toBool())
+        m_statusNotifierHostRegistered = true;
     else
-        qCDebug(qLcMenu) << "failed to find service" << StatusNotifierWatcherService;
+        qCDebug(qLcMenu) << "StatusNotifierHost is not registered";
 #endif
 }
 
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