From 32959b018c14782f29db4fa5dd4bd76ae96bd511 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Mon, 25 Feb 2019 13:48:11 +0300 Subject: in this case there's no sense to use GetClientJID at all... --- protocols/JabberG/src/jabber_proto.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'protocols/JabberG/src') diff --git a/protocols/JabberG/src/jabber_proto.cpp b/protocols/JabberG/src/jabber_proto.cpp index f213af7ef6..ea269c7dfe 100755 --- a/protocols/JabberG/src/jabber_proto.cpp +++ b/protocols/JabberG/src/jabber_proto.cpp @@ -605,12 +605,12 @@ int CJabberProto::GetInfo(MCONTACT hContact, int /*infoType*/) if (!m_bJabberOnline || isChatRoom(hContact)) return 1; - char jid[JABBER_MAX_JID_LEN], szBareJid[JABBER_MAX_JID_LEN]; - if (!GetClientJID(hContact, jid, _countof(jid))) + ptrA jid(getUStringA("jid")); + if (!jid) return 1; + char szBareJid[JABBER_MAX_JID_LEN]; JabberStripJid(jid, szBareJid, _countof(szBareJid)); - bool bUseResource = ListGetItemPtr(LIST_CHATROOM, szBareJid) != nullptr; if (m_ThreadInfo) { m_ThreadInfo->send( @@ -657,7 +657,7 @@ int CJabberProto::GetInfo(MCONTACT hContact, int /*infoType*/) } } - SendGetVcard(bUseResource ? jid : szBareJid); + SendGetVcard(jid); return 0; } -- cgit v1.2.3