diff options
| author | George Hazan <ghazan@miranda.im> | 2019-12-04 16:08:03 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2019-12-04 16:08:03 +0300 |
| commit | 3bb16e798cb51d5764aacbefd4edf26f52d8c4f0 (patch) | |
| tree | 59dbb53fc9496d660ec2ef2846a4eab0f1720b88 /protocols/JabberG/src | |
| parent | 3216d8df5cb355f34c82ed10b7e40bab7525b697 (diff) | |
GetContactProto: useless duplicate function replaced with standard Proto_GetBaseAccountName
Diffstat (limited to 'protocols/JabberG/src')
| -rw-r--r-- | protocols/JabberG/src/jabber_chat.cpp | 2 | ||||
| -rw-r--r-- | protocols/JabberG/src/jabber_privacy.cpp | 2 | ||||
| -rwxr-xr-x | protocols/JabberG/src/jabber_userinfo.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/protocols/JabberG/src/jabber_chat.cpp b/protocols/JabberG/src/jabber_chat.cpp index 8acda4ce0c..03ce11c438 100644 --- a/protocols/JabberG/src/jabber_chat.cpp +++ b/protocols/JabberG/src/jabber_chat.cpp @@ -651,7 +651,7 @@ class CGroupchatInviteDlg : public CJabberDlgBase void FilterList(CCtrlClc *)
{
for (auto &hContact : Contacts()) {
- char *proto = GetContactProto(hContact);
+ char *proto = Proto_GetBaseAccountName(hContact);
if (mir_strcmp(proto, m_proto->m_szModuleName) || m_proto->isChatRoom(hContact))
if (HANDLE hItem = m_clc.FindContact(hContact))
m_clc.DeleteItem(hItem);
diff --git a/protocols/JabberG/src/jabber_privacy.cpp b/protocols/JabberG/src/jabber_privacy.cpp index deac3df095..8c942de3d2 100644 --- a/protocols/JabberG/src/jabber_privacy.cpp +++ b/protocols/JabberG/src/jabber_privacy.cpp @@ -947,7 +947,7 @@ class CJabberDlgPrivacyLists : public CJabberDlgBase void CListFilter()
{
for (auto &hContact : Contacts()) {
- char *proto = GetContactProto(hContact);
+ char *proto = Proto_GetBaseAccountName(hContact);
if (!proto || mir_strcmp(proto, m_proto->m_szModuleName))
if (HANDLE hItem = m_clcClist.FindContact(hContact))
m_clcClist.DeleteItem(hItem);
diff --git a/protocols/JabberG/src/jabber_userinfo.cpp b/protocols/JabberG/src/jabber_userinfo.cpp index 1a3e01f3d2..4202224b71 100755 --- a/protocols/JabberG/src/jabber_userinfo.cpp +++ b/protocols/JabberG/src/jabber_userinfo.cpp @@ -764,7 +764,7 @@ int CJabberProto::OnUserInfoInit(WPARAM wParam, LPARAM hContact) return 0; } - char *szProto = GetContactProto(hContact); + char *szProto = Proto_GetBaseAccountName(hContact); if (szProto != nullptr && !mir_strcmp(szProto, m_szModuleName)) { OPTIONSDIALOGPAGE odp = {}; odp.dwInitParam = (LPARAM)this; |