diff options
| author | Jeremy Lainé <jeremy.laine@m4x.org> | 2014-07-19 10:23:40 +0200 |
|---|---|---|
| committer | Jeremy Lainé <jeremy.laine@m4x.org> | 2014-07-19 10:23:40 +0200 |
| commit | 70e7b6005de3e4a2e0237f18196825d96f4ee4d3 (patch) | |
| tree | 1b017e68025534d194362a6dc206f04a2ca8f553 /src/client/QXmppDiscoveryManager.cpp | |
| parent | 68f89992207c592cf0be8567d5c3d5e43157f9b6 (diff) | |
| parent | 07ae4a63307928e1af97b75b3de23530c74beb3f (diff) | |
| download | qxmpp-70e7b6005de3e4a2e0237f18196825d96f4ee4d3.tar.gz | |
Merge branch 'master' of github.com:qxmpp-project/qxmpp
Diffstat (limited to 'src/client/QXmppDiscoveryManager.cpp')
| -rw-r--r-- | src/client/QXmppDiscoveryManager.cpp | 3 |
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()) { |