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/FacebookRM/src/contacts.cpp | 2 +- protocols/FacebookRM/src/proto.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'protocols/FacebookRM/src') diff --git a/protocols/FacebookRM/src/contacts.cpp b/protocols/FacebookRM/src/contacts.cpp index 2d4c81513e..751eba0904 100644 --- a/protocols/FacebookRM/src/contacts.cpp +++ b/protocols/FacebookRM/src/contacts.cpp @@ -63,7 +63,7 @@ void FacebookProto::SaveName(MCONTACT hContact, const facebook_user *fbu) bool FacebookProto::IsMyContact(MCONTACT hContact, bool include_chat) { - const char *proto = GetContactProto(hContact); + const char *proto = Proto_GetBaseAccountName(hContact); if (proto && !mir_strcmp(m_szModuleName, proto)) { if (include_chat) return true; diff --git a/protocols/FacebookRM/src/proto.cpp b/protocols/FacebookRM/src/proto.cpp index ef5f0f6399..1c73d3194f 100644 --- a/protocols/FacebookRM/src/proto.cpp +++ b/protocols/FacebookRM/src/proto.cpp @@ -536,7 +536,7 @@ int FacebookProto::OnProcessSrmmEvent(WPARAM, LPARAM lParam) int FacebookProto::OnPreCreateEvent(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; std::map::iterator it = facy.messages_timestamp.find(evt->seq); -- cgit v1.2.3