From 3bb16e798cb51d5764aacbefd4edf26f52d8c4f0 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Wed, 4 Dec 2019 16:08:03 +0300 Subject: GetContactProto: useless duplicate function replaced with standard Proto_GetBaseAccountName --- protocols/Tox/src/tox_contacts.cpp | 6 +++--- protocols/Tox/src/tox_messages.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'protocols/Tox/src') diff --git a/protocols/Tox/src/tox_contacts.cpp b/protocols/Tox/src/tox_contacts.cpp index f9ba570330..ca6de59f40 100644 --- a/protocols/Tox/src/tox_contacts.cpp +++ b/protocols/Tox/src/tox_contacts.cpp @@ -348,7 +348,7 @@ int CToxProto::OnUserInfoInit(WPARAM wParam, LPARAM hContact) if (!Proto_IsProtocolLoaded(m_szModuleName)) return 0; - char *szProto = GetContactProto(hContact); + char *szProto = Proto_GetBaseAccountName(hContact); if (szProto != nullptr && !mir_strcmp(szProto, m_szModuleName)) { OPTIONSDIALOGPAGE odp = { sizeof(odp) }; odp.flags = ODPF_UNICODE | ODPF_DONTTRANSLATE; @@ -382,7 +382,7 @@ INT_PTR CToxProto::UserInfoProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lPar case PSN_INFOCHANGED: { MCONTACT hContact = (MCONTACT)((LPPSHNOTIFY)lParam)->lParam; - char *szProto = (hContact == NULL) ? proto->m_szModuleName : GetContactProto(hContact); + char *szProto = (hContact == NULL) ? proto->m_szModuleName : Proto_GetBaseAccountName(hContact); if (szProto != nullptr) SetDlgItemText(hwnd, IDC_DNS_ID, ptrW(proto->getWStringA(hContact, TOX_SETTINGS_DNS))); } @@ -394,7 +394,7 @@ INT_PTR CToxProto::UserInfoProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lPar case PSN_APPLY: MCONTACT hContact = (MCONTACT)((LPPSHNOTIFY)lParam)->lParam; - char *szProto = (hContact == NULL) ? proto->m_szModuleName : GetContactProto(hContact); + char *szProto = (hContact == NULL) ? proto->m_szModuleName : Proto_GetBaseAccountName(hContact); if (szProto == nullptr) break; diff --git a/protocols/Tox/src/tox_messages.cpp b/protocols/Tox/src/tox_messages.cpp index cce56c5a10..4ec181e021 100644 --- a/protocols/Tox/src/tox_messages.cpp +++ b/protocols/Tox/src/tox_messages.cpp @@ -145,7 +145,7 @@ void CToxProto::OnReadReceipt(Tox *tox, uint32_t friendNumber, uint32_t messageN int CToxProto::OnPreCreateMessage(WPARAM, LPARAM lParam) { MessageWindowEvent *evt = (MessageWindowEvent*)lParam; - if (mir_strcmp(GetContactProto(evt->hContact), m_szModuleName)) + if (mir_strcmp(Proto_GetBaseAccountName(evt->hContact), m_szModuleName)) return 0; char *message = (char*)evt->dbei->pBlob; -- cgit v1.2.3