diff options
| author | George Hazan <ghazan@miranda.im> | 2019-09-16 12:55:18 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2019-09-16 12:55:18 +0300 |
| commit | 995bdd0b21843955075c5e6e9c6bcf47b2cc3ae7 (patch) | |
| tree | 726e7b68d3bd58f2f9a95f73899460eb227d24af /protocols | |
| parent | eb84e01cdc1c9558f06a6cc99848d54fe19dc004 (diff) | |
fixes #2062 (Jabber: chinese chars in MUC ban/admin/moder/members list)
Diffstat (limited to 'protocols')
| -rw-r--r-- | protocols/JabberG/src/jabber_iqid_muc.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
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;
}
}
|