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/ICQ-WIM/src/groupchats.cpp | 2 +- protocols/ICQ-WIM/src/proto.cpp | 2 +- protocols/ICQ-WIM/src/userinfo.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'protocols/ICQ-WIM/src') diff --git a/protocols/ICQ-WIM/src/groupchats.cpp b/protocols/ICQ-WIM/src/groupchats.cpp index 7d6f991a3d..c3826fc2f6 100644 --- a/protocols/ICQ-WIM/src/groupchats.cpp +++ b/protocols/ICQ-WIM/src/groupchats.cpp @@ -91,7 +91,7 @@ class CGroupchatInviteDlg : public CIcqDlgBase 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/ICQ-WIM/src/proto.cpp b/protocols/ICQ-WIM/src/proto.cpp index bb9c5e1c78..3e41302dd5 100644 --- a/protocols/ICQ-WIM/src/proto.cpp +++ b/protocols/ICQ-WIM/src/proto.cpp @@ -316,7 +316,7 @@ int CIcqProto::OnDbEventRead(WPARAM, LPARAM hDbEvent) return 0; // filter out only events of my protocol - const char *szProto = GetContactProto(hContact); + const char *szProto = Proto_GetBaseAccountName(hContact); if (mir_strcmp(szProto, m_szModuleName)) return 0; diff --git a/protocols/ICQ-WIM/src/userinfo.cpp b/protocols/ICQ-WIM/src/userinfo.cpp index f30cbc37cd..4aa331f803 100644 --- a/protocols/ICQ-WIM/src/userinfo.cpp +++ b/protocols/ICQ-WIM/src/userinfo.cpp @@ -49,7 +49,7 @@ static INT_PTR CALLBACK IcqDlgProc(HWND hwndDlg, UINT msg, WPARAM, LPARAM lParam int CIcqProto::OnUserInfoInit(WPARAM wParam, LPARAM hContact) { - if (hContact && mir_strcmp(GetContactProto(hContact), m_szModuleName)) + if (hContact && mir_strcmp(Proto_GetBaseAccountName(hContact), m_szModuleName)) return 0; if (isChatRoom(hContact)) -- cgit v1.2.3