aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Lainé <jeremy.laine@m4x.org>2012-04-16 07:59:22 +0000
committerJeremy Lainé <jeremy.laine@m4x.org>2012-04-16 07:59:22 +0000
commit3aaee1a9ec4a92afce66cdf5ad67f4a1d16480f9 (patch)
treed033cce9042cf16f7a1f19b499184263049b6f40
parentc6623e6a7e86fab1c973900ede0de1eb2e488230 (diff)
downloadqxmpp-3aaee1a9ec4a92afce66cdf5ad67f4a1d16480f9.tar.gz
Advertise support for XEP-0249: Direct MUC Invitations
-rw-r--r--CHANGELOG5
-rw-r--r--src/client/QXmppMucManager.cpp3
2 files changed, 7 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 1a0968db..eda4ffdd 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,8 @@
+QXmpp 0.5.0 (UNRELEASED)
+------------------------
+
+ - Advertise support for XEP-0249: Direct MUC Invitations
+
QXmpp 0.4.0 (Apr 12, 2012)
--------------------------
diff --git a/src/client/QXmppMucManager.cpp b/src/client/QXmppMucManager.cpp
index 3f1cdef3..5c2a6236 100644
--- a/src/client/QXmppMucManager.cpp
+++ b/src/client/QXmppMucManager.cpp
@@ -111,7 +111,8 @@ QStringList QXmppMucManager::discoveryFeatures() const
<< ns_muc
<< ns_muc_admin
<< ns_muc_owner
- << ns_muc_user;
+ << ns_muc_user
+ << ns_conference;
}
bool QXmppMucManager::handleStanza(const QDomElement &element)