diff options
| author | George Hazan <ghazan@miranda.im> | 2018-07-20 13:25:21 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2018-07-20 13:25:21 +0300 |
| commit | 509fbd91ed545d05cc266a80ec19fe7b9c9d28db (patch) | |
| tree | 09c2d97d212c0820f6d5e85d7e583b8a56b26ef8 /protocols/Tox/src | |
| parent | c90b4443c10b08eeae9466428255fe8ff7b48d6d (diff) | |
we don't need two name sets for the same array of functions
Diffstat (limited to 'protocols/Tox/src')
| -rw-r--r-- | protocols/Tox/src/tox_core.cpp | 4 | ||||
| -rw-r--r-- | protocols/Tox/src/tox_options.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/protocols/Tox/src/tox_core.cpp b/protocols/Tox/src/tox_core.cpp index f3fa95b84d..b1139c6c4f 100644 --- a/protocols/Tox/src/tox_core.cpp +++ b/protocols/Tox/src/tox_core.cpp @@ -74,7 +74,7 @@ void CToxProto::InitToxCore(Tox *tox) /*uint8_t nick[TOX_MAX_NAME_LENGTH] = { 0 };
tox_self_get_name(toxThread->Tox(), nick);
- setWString("Nick", ptrW(Utf8DecodeW((char*)nick)));*/
+ setWString("Nick", ptrW(mir_utf8decodeW((char*)nick)));*/
ptrA nick(mir_utf8encodeW(ptrW(getWStringA("Nick"))));
tox_self_set_name(tox, (uint8_t*)(char*)nick, mir_strlen(nick), &error);
@@ -83,7 +83,7 @@ void CToxProto::InitToxCore(Tox *tox) /*uint8_t statusMessage[TOX_MAX_STATUS_MESSAGE_LENGTH] = { 0 };
tox_self_get_status_message(toxThread->Tox(), statusMessage);
- setWString("StatusMsg", ptrW(Utf8DecodeW((char*)statusMessage)));*/
+ setWString("StatusMsg", ptrW(mir_utf8decodeW((char*)statusMessage)));*/
ptrA statusMessage(mir_utf8encodeW(ptrW(getWStringA("StatusMsg"))));
tox_self_set_status_message(tox, (uint8_t*)(char*)statusMessage, mir_strlen(statusMessage), &error);
diff --git a/protocols/Tox/src/tox_options.cpp b/protocols/Tox/src/tox_options.cpp index 1d74a5fadc..682ee2cc5d 100644 --- a/protocols/Tox/src/tox_options.cpp +++ b/protocols/Tox/src/tox_options.cpp @@ -183,13 +183,13 @@ void CToxOptionsMain::ProfileImport_OnClick(CCtrlButton*) uint8_t nick[TOX_MAX_NAME_LENGTH] = { 0 };
tox_self_get_name(toxThread.Tox(), nick);
- ptrW nickname(Utf8DecodeW((char*)nick));
+ ptrW nickname(mir_utf8decodeW((char*)nick));
m_proto->setWString("Nick", nickname);
m_nickname.SetText(nickname);
uint8_t statusMessage[TOX_MAX_STATUS_MESSAGE_LENGTH] = { 0 };
tox_self_get_status_message(toxThread.Tox(), statusMessage);
- m_proto->setWString("StatusMsg", ptrW(Utf8DecodeW((char*)statusMessage)));
+ m_proto->setWString("StatusMsg", ptrW(mir_utf8decodeW((char*)statusMessage)));
ShowWindow(m_profileCreate.GetHwnd(), FALSE);
ShowWindow(m_profileImport.GetHwnd(), FALSE);
|