Merge remote-tracking branch 'origin/master' into jabber_test

 Conflicts:
	protocols/JabberG/src/jabber_util.cpp

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");