From 995bdd0b21843955075c5e6e9c6bcf47b2cc3ae7 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Mon, 16 Sep 2019 12:55:18 +0300 Subject: fixes #2062 (Jabber: chinese chars in MUC ban/admin/moder/members list) --- protocols/JabberG/src/jabber_iqid_muc.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'protocols') diff --git a/protocols/JabberG/src/jabber_iqid_muc.cpp b/protocols/JabberG/src/jabber_iqid_muc.cpp index 3079cfa96a..5ed59063f4 100644 --- a/protocols/JabberG/src/jabber_iqid_muc.cpp +++ b/protocols/JabberG/src/jabber_iqid_muc.cpp @@ -120,17 +120,19 @@ class CJabberMucJidListDlg : public CJabberDlgBase if (jid == nullptr) continue; - lvi.pszText = (wchar_t*)jid; + Utf2T wszJid(jid); + lvi.pszText = wszJid; + if (m_info->type == MUC_BANLIST) { if (auto *reason = XmlGetChildText(itemNode, "reason")) { - mir_snwprintf(tszItemText, L"%s (%s)", Utf2T(jid).get(), Utf2T(reason).get()); + mir_snwprintf(tszItemText, L"%s (%s)", wszJid.get(), Utf2T(reason).get()); lvi.pszText = tszItemText; } } else if (m_info->type == MUC_VOICELIST || m_info->type == MUC_MODERATORLIST) { const char *nick = XmlGetAttr(itemNode, "nick"); if (nick != nullptr) { - mir_snwprintf(tszItemText, L"%s (%s)", Utf2T(nick).get(), Utf2T(jid).get()); + mir_snwprintf(tszItemText, L"%s (%s)", Utf2T(nick).get(), wszJid.get()); lvi.pszText = tszItemText; } } -- cgit v1.2.3