Improve Service Discovery

1 files changed, 7 insertions, 4 deletions

diff --git a/src/server/mod_disco.cpp b/src/server/mod_disco.cpp
index c6377f99..fe257cf6 100644
--- a/src/server/mod_disco.cpp
+++ b/src/server/mod_disco.cpp
@@ -68,11 +68,14 @@ bool QXmppServerDiscovery::handleStanza(QXmppStream *incoming, const QDomElement
         if (request.queryType() == QXmppDiscoveryIq::ItemsQuery)
         {
             QList<QXmppDiscoveryIq::Item> items;
-            foreach (const QString &jid, m_discoveryItems)
+            foreach (QXmppServerExtension *extension, m_server->loadedExtensions())
             {
-                QXmppDiscoveryIq::Item item;
-                item.setJid(jid);
-                items.append(item);
+                foreach (const QString &jid, extension->discoveryItems())
+                {
+                    QXmppDiscoveryIq::Item item;
+                    item.setJid(jid);
+                    items.append(item);
+                }
             }
             response.setItems(items);
         } else {