aboutsummaryrefslogtreecommitdiff
path: root/src/client
diff options
context:
space:
mode:
authorJeremy Lainé <jeremy.laine@m4x.org>2014-06-23 13:25:54 +0200
committerJeremy Lainé <jeremy.laine@m4x.org>2014-06-23 13:25:54 +0200
commit07ae4a63307928e1af97b75b3de23530c74beb3f (patch)
tree8ff1632c2e6a2ecc0fccf60e97525accc77b869d /src/client
parentc1dc26549ec15abebfd020dbd9a95b1b9915b95b (diff)
parent754314fe90964d84a3514846ebfa5ec16844bd9b (diff)
downloadqxmpp-07ae4a63307928e1af97b75b3de23530c74beb3f.tar.gz
Merge pull request #8 from trulabs/feature/XEP-0333
XEP-0333: Chat Markers
Diffstat (limited to 'src/client')
-rw-r--r--src/client/QXmppDiscoveryManager.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/client/QXmppDiscoveryManager.cpp b/src/client/QXmppDiscoveryManager.cpp
index 5188a4e7..7c9a777e 100644
--- a/src/client/QXmppDiscoveryManager.cpp
+++ b/src/client/QXmppDiscoveryManager.cpp
@@ -115,7 +115,8 @@ QXmppDiscoveryIq QXmppDiscoveryManager::capabilities()
<< ns_chat_states // XEP-0085: Chat State Notifications
<< ns_capabilities // XEP-0115: Entity Capabilities
<< ns_ping // XEP-0199: XMPP Ping
- << ns_attention; // XEP-0224: Attention
+ << ns_attention // XEP-0224: Attention
+ << ns_chat_markers; // XEP-0333: Chat Markers
foreach(QXmppClientExtension* extension, client()->extensions())
{