diff options
| author | Gluzskiy Alexandr <sss@sss.chaoslab.ru> | 2016-10-19 20:34:18 +0300 |
|---|---|---|
| committer | Gluzskiy Alexandr <sss@sss.chaoslab.ru> | 2016-10-19 20:34:18 +0300 |
| commit | 2a877dcf06389fdc1dcd65e9c56562eb3a0787f0 (patch) | |
| tree | 89d311474a357955269c975ccbc5a6abf8b2b1a9 /protocols/JabberG/src/jabber_util.cpp | |
| parent | 072bfe7969fded36f765cc14185879ccbc90c8b6 (diff) | |
| parent | 38e45092ed0f39dd347e33833f74fafd51d94597 (diff) | |
Merge remote-tracking branch 'origin/master' into jabber_test
Conflicts:
protocols/JabberG/src/jabber_util.cpp
Diffstat (limited to 'protocols/JabberG/src/jabber_util.cpp')
| -rwxr-xr-x | protocols/JabberG/src/jabber_util.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/protocols/JabberG/src/jabber_util.cpp b/protocols/JabberG/src/jabber_util.cpp index e8525a9478..b0e2a15f8b 100755 --- a/protocols/JabberG/src/jabber_util.cpp +++ b/protocols/JabberG/src/jabber_util.cpp @@ -384,6 +384,7 @@ void CJabberProto::SendPresenceTo(int status, const wchar_t* to, HXML extra, con XmlAddChild(p, extra);
// XEP-0115:Entity Capabilities
+ if (m_options.AllowVersionRequests) {
HXML c = p << XCHILDNS(L"c", JABBER_FEAT_ENTITY_CAPS) << XATTR(L"node", L"http://client/caps")
<< XATTR(L"ver", szCoreVersion);
@@ -432,6 +433,7 @@ void CJabberProto::SendPresenceTo(int status, const wchar_t* to, HXML extra, con }
XmlAddAttr(c, L"ext", szExtCaps);
}
+ }
if (m_options.EnableAvatars) {
HXML x = p << XCHILDNS(L"x", L"vcard-temp:x:update");
|