Fix QXmppMucRoom::name(), only consider discovery IQs from the room.

2 files changed, 16 insertions, 9 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 5f6cbc76..176129cc 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,8 @@
+QXmpp 0.7.3 (UNRELEASED)
+------------------------
+
+  - Fix QXmppMucRoom::name(), only consider discovery IQs from the room.
+
 QXmpp 0.7.2 (Sep 6, 2012)
 -------------------------
 
diff --git a/src/client/QXmppMucManager.cpp b/src/client/QXmppMucManager.cpp
index 71fe6c47..e1fbed0e 100644
--- a/src/client/QXmppMucManager.cpp
+++ b/src/client/QXmppMucManager.cpp
@@ -606,17 +606,19 @@ void QXmppMucRoom::_q_disconnected()
 
 void QXmppMucRoom::_q_discoveryInfoReceived(const QXmppDiscoveryIq &iq)
 {
-    QString name;
-    foreach (const QXmppDiscoveryIq::Identity &identity, iq.identities()) {
-        if (identity.category() == "conference") {
-            name = identity.name();
-            break;
+    if (iq.from() == d->jid) {
+        QString name;
+        foreach (const QXmppDiscoveryIq::Identity &identity, iq.identities()) {
+            if (identity.category() == "conference") {
+                name = identity.name();
+                break;
+            }
         }
-    }
 
-    if (name != d->name) {
-        d->name = name;
-        emit nameChanged(name);
+        if (name != d->name) {
+            d->name = name;
+            emit nameChanged(name);
+        }
     }
 }