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/Sametime/src/sametime_proto.cpp | 2 +- protocols/Sametime/src/userlist.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'protocols/Sametime/src') diff --git a/protocols/Sametime/src/sametime_proto.cpp b/protocols/Sametime/src/sametime_proto.cpp index db816ad08b..37b158cb1a 100644 --- a/protocols/Sametime/src/sametime_proto.cpp +++ b/protocols/Sametime/src/sametime_proto.cpp @@ -203,7 +203,7 @@ int CSametimeProto::SendMsg(MCONTACT hContact, int, const char* msg) { debugLogW(L"CSametimeProto::SendMsg() hContact=[%x]", hContact); - char *proto = GetContactProto(hContact); + char *proto = Proto_GetBaseAccountName(hContact); if (!proto || mir_strcmp(proto, m_szModuleName) != 0 || db_get_w(hContact, m_szModuleName, "Status", ID_STATUS_OFFLINE) == ID_STATUS_OFFLINE) { TFakeAckParams* tfap = (TFakeAckParams*)mir_alloc(sizeof(TFakeAckParams)); tfap->proto = this; diff --git a/protocols/Sametime/src/userlist.cpp b/protocols/Sametime/src/userlist.cpp index 94545c4d13..0b39a4fa6d 100644 --- a/protocols/Sametime/src/userlist.cpp +++ b/protocols/Sametime/src/userlist.cpp @@ -18,7 +18,7 @@ MCONTACT CSametimeProto::FindContactByUserId(const char* id) bool CSametimeProto::GetAwareIdFromContact(MCONTACT hContact, mwAwareIdBlock* id_block) { - char *proto = GetContactProto(hContact); + char *proto = Proto_GetBaseAccountName(hContact); DBVARIANT dbv; if (proto && !mir_strcmp(m_szModuleName, proto)) { if (!db_get_utf(hContact, m_szModuleName, "stid", &dbv)) { -- cgit v1.2.3