diff options
| author | George Hazan <ghazan@miranda.im> | 2019-04-08 19:11:24 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2019-04-08 19:11:24 +0300 |
| commit | 106ee67ae25419a2258c91b2d6e7a00312a51de0 (patch) | |
| tree | 62e9b1cf626e00db59bec3a809ec2e4543d28e70 /protocols/JabberG/src/jabber_caps.cpp | |
| parent | c78da653c2806e0ac72e0c7baa499342a4c637e5 (diff) | |
Jabber: merge of fixes from trunk
Diffstat (limited to 'protocols/JabberG/src/jabber_caps.cpp')
| -rwxr-xr-x | protocols/JabberG/src/jabber_caps.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/protocols/JabberG/src/jabber_caps.cpp b/protocols/JabberG/src/jabber_caps.cpp index 508b7126c1..50a94e6204 100755 --- a/protocols/JabberG/src/jabber_caps.cpp +++ b/protocols/JabberG/src/jabber_caps.cpp @@ -229,10 +229,8 @@ JabberCapsBits CJabberProto::GetTotalJidCapabilities(const char *jid) if (item) {
for (auto &it : item->arResources) {
- char szFullJid[JABBER_MAX_JID_LEN];
- mir_snprintf(szFullJid, "%s/%s", szBareJid, it->m_szResourceName);
pResourceStatus r(it);
- JabberCapsBits jcb = GetResourceCapabilities(szFullJid, r);
+ JabberCapsBits jcb = GetResourceCapabilities(MakeJid(szBareJid, it->m_szResourceName), r);
if (!(jcb & JABBER_RESOURCE_CAPS_ERROR))
jcbToReturn |= jcb;
}
|