summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorge Hazan <ghazan@miranda.im>2022-07-20 21:14:36 +0300
committerGeorge Hazan <ghazan@miranda.im>2022-07-20 21:14:36 +0300
commit68112c6938e917cc35044121409e6fea434ef6c0 (patch)
treeb4083cdb83c6a76bbecac99956a1edc2e25d3b0d
parent02919456e615e75ca6718cfc11cd933d0f80e8e6 (diff)
Jabber: feature hash to be sent always
-rw-r--r--protocols/JabberG/src/jabber_caps.cpp2
-rw-r--r--protocols/JabberG/src/jabber_util.cpp6
2 files changed, 3 insertions, 5 deletions
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<char> arrExtCaps(5);
if (g_plugin.bSecureIM)
arrExtCaps.insert(JABBER_EXT_SECUREIM);