From 68112c6938e917cc35044121409e6fea434ef6c0 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Wed, 20 Jul 2022 21:14:36 +0300 Subject: Jabber: feature hash to be sent always --- protocols/JabberG/src/jabber_caps.cpp | 2 -- protocols/JabberG/src/jabber_util.cpp | 6 +++--- 2 files changed, 3 insertions(+), 5 deletions(-) (limited to 'protocols/JabberG/src') diff --git a/protocols/JabberG/src/jabber_caps.cpp b/protocols/JabberG/src/jabber_caps.cpp index af7ea89ba8..3c727e4986 100644 --- a/protocols/JabberG/src/jabber_caps.cpp +++ b/protocols/JabberG/src/jabber_caps.cpp @@ -401,8 +401,6 @@ void CJabberProto::RequestOldCapsInfo(pResourceStatus &r, const char *fullJid) void CJabberProto::UpdateFeatHash() { - m_szFeaturesCrc.Empty(); - ptrA szName(getStringA("Identity", "Miranda")); // hidden setting to be entered from dbeditor++ CMStringA feat_buf(FORMAT, "client/pc//%s<", szName.get()); diff --git a/protocols/JabberG/src/jabber_util.cpp b/protocols/JabberG/src/jabber_util.cpp index f620593fed..2a0cbb4327 100644 --- a/protocols/JabberG/src/jabber_util.cpp +++ b/protocols/JabberG/src/jabber_util.cpp @@ -416,10 +416,10 @@ void CJabberProto::SendPresenceTo(int status, const char *to, const TiXmlElement p += extra; // XEP-0115:Entity Capabilities + TiXmlElement *c = p << XCHILDNS("c", JABBER_FEAT_ENTITY_CAPS) << XATTR("hash", "sha-1") + << XATTR("node", JABBER_CAPS_MIRANDA_NODE) << XATTR("ver", m_szFeaturesCrc); + if (m_bAllowVersionRequests) { - TiXmlElement *c = p << XCHILDNS("c", JABBER_FEAT_ENTITY_CAPS) << XATTR("hash", "sha-1") - << XATTR("node", JABBER_CAPS_MIRANDA_NODE) << XATTR("ver", m_szFeaturesCrc); - LIST arrExtCaps(5); if (g_plugin.bSecureIM) arrExtCaps.insert(JABBER_EXT_SECUREIM); -- cgit v1.2.3