From 106ee67ae25419a2258c91b2d6e7a00312a51de0 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Mon, 8 Apr 2019 19:11:24 +0300 Subject: Jabber: merge of fixes from trunk --- protocols/JabberG/src/jabber_caps.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'protocols/JabberG/src/jabber_caps.cpp') 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; } -- cgit v1.2.3