From 206f15f700b31dc45c2ad6b7c1ec21142d6a38a5 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Tue, 21 Mar 2017 13:30:53 +0300 Subject: warning fix --- protocols/JabberG/src/jabber_chat.cpp | 2 +- protocols/JabberG/src/jabber_groupchat.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'protocols/JabberG/src') diff --git a/protocols/JabberG/src/jabber_chat.cpp b/protocols/JabberG/src/jabber_chat.cpp index c431395078..e5b5a5c0b2 100644 --- a/protocols/JabberG/src/jabber_chat.cpp +++ b/protocols/JabberG/src/jabber_chat.cpp @@ -1263,7 +1263,7 @@ static void sttLogListHook(CJabberProto *ppro, JABBER_LIST_ITEM *item, GCHOOK* g if (ppro->EnterString(szBuffer, szTitle, ESF_COMBO, "gcNick_")) { if (ppro->ListGetItemPtr(LIST_CHATROOM, gch->pDest->ptszID) != NULL) { wchar_t text[1024]; - mir_snwprintf(text, L"%s/%s", gch->pDest->ptszID, szBuffer); + mir_snwprintf(text, L"%s/%s", gch->pDest->ptszID, szBuffer.c_str()); ppro->SendPresenceTo(ppro->m_iStatus == ID_STATUS_INVISIBLE ? ID_STATUS_ONLINE : ppro->m_iStatus, text, NULL); } } diff --git a/protocols/JabberG/src/jabber_groupchat.cpp b/protocols/JabberG/src/jabber_groupchat.cpp index 539758a0e8..5f433b2f74 100644 --- a/protocols/JabberG/src/jabber_groupchat.cpp +++ b/protocols/JabberG/src/jabber_groupchat.cpp @@ -754,7 +754,7 @@ static VOID CALLBACK JabberGroupchatChangeNickname(void* arg) if (param->ppro->EnterString(szBuffer, szTitle, ESF_COMBO, "gcNick_")) { replaceStrW(item->nick, szBuffer); - param->ppro->SendPresenceTo(param->ppro->m_iStatus, CMStringW(FORMAT, L"%s/%s", item->jid, szBuffer), NULL); + param->ppro->SendPresenceTo(param->ppro->m_iStatus, CMStringW(FORMAT, L"%s/%s", item->jid, szBuffer.c_str()), NULL); } } @@ -1151,7 +1151,7 @@ public: CSuper::OnInitDialog(); wchar_t buf[256]; - mir_snwprintf(buf, TranslateT("Group chat invitation to\n%s"), m_roomJid); + mir_snwprintf(buf, TranslateT("Group chat invitation to\n%s"), m_roomJid.c_str()); SetDlgItemText(m_hwnd, IDC_HEADERBAR, buf); SetDlgItemText(m_hwnd, IDC_FROM, m_from); -- cgit v1.2.3