diff options
Diffstat (limited to 'protocols/JabberG/src/jabber_thread.cpp')
| -rwxr-xr-x | protocols/JabberG/src/jabber_thread.cpp | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/protocols/JabberG/src/jabber_thread.cpp b/protocols/JabberG/src/jabber_thread.cpp index 432510910c..52d7a462f6 100755 --- a/protocols/JabberG/src/jabber_thread.cpp +++ b/protocols/JabberG/src/jabber_thread.cpp @@ -1432,14 +1432,11 @@ void CJabberProto::OnProcessPresenceCapabilites(const TiXmlElement *node, pResou if (szHash == nullptr) { // old version
BYTE hashOut[MIR_SHA1_HASH_SIZE];
mir_sha1_hash((BYTE*)szVer, mir_strlen(szVer), hashOut);
- char szHashOut[MIR_SHA1_HASH_SIZE * 2 + 1];
- bin2hex(hashOut, _countof(hashOut), szHashOut);
- r->m_pCaps = m_clientCapsManager.GetPartialCaps(szNode, szHashOut);
- if (r->m_pCaps == nullptr)
- GetCachedCaps(szNode, szHashOut, r);
+ char szHashOut[MIR_SHA1_HASH_SIZE*2 + 1];
+ r->m_pCaps = g_clientCapsManager.GetPartialCaps(szNode, bin2hex(hashOut, _countof(hashOut), szHashOut));
if (r->m_pCaps == nullptr) {
- r->m_pCaps = m_clientCapsManager.SetClientCaps(szNode, szHashOut, szVer, JABBER_RESOURCE_CAPS_UNINIT);
+ r->m_pCaps = g_clientCapsManager.SetClientCaps(szNode, szHashOut, szVer, JABBER_RESOURCE_CAPS_UNINIT);
RequestOldCapsInfo(r, from);
}
@@ -1448,12 +1445,9 @@ void CJabberProto::OnProcessPresenceCapabilites(const TiXmlElement *node, pResou UpdateMirVer(hContact, r);
}
else {
- r->m_pCaps = m_clientCapsManager.GetPartialCaps(szNode, szVer);
- if (r->m_pCaps == nullptr)
- GetCachedCaps(szNode, szVer, r);
-
+ r->m_pCaps = g_clientCapsManager.GetPartialCaps(szNode, szVer);
if (r->m_pCaps == nullptr) {
- r->m_pCaps = m_clientCapsManager.SetClientCaps(szNode, szVer, "", JABBER_RESOURCE_CAPS_UNINIT);
+ r->m_pCaps = g_clientCapsManager.SetClientCaps(szNode, szVer, "", JABBER_RESOURCE_CAPS_UNINIT);
GetResourceCapabilities(from, r);
}
}
|