From 07d0e72d6e7f9fa73d49c2f779206abf79f4a5a7 Mon Sep 17 00:00:00 2001
From: Jeremy Lainé <jeremy.laine@m4x.org>
Date: Sat, 28 Aug 2010 01:01:00 +0000
Subject: Improve Service Discovery

---
 src/server/mod_disco.cpp | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'src/server/mod_disco.cpp')

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 {
-- 
cgit v1.2.3