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/CloudFile/src/cloud_file.cpp | 2 +- protocols/CloudFile/src/utils.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'protocols/CloudFile') diff --git a/protocols/CloudFile/src/cloud_file.cpp b/protocols/CloudFile/src/cloud_file.cpp index f6019f8196..6cd398adb3 100644 --- a/protocols/CloudFile/src/cloud_file.cpp +++ b/protocols/CloudFile/src/cloud_file.cpp @@ -78,7 +78,7 @@ HANDLE CCloudService::SendFile(MCONTACT hContact, const wchar_t *description, wc void CCloudService::OpenUploadDialog(MCONTACT hContact) { - char *proto = GetContactProto(hContact); + char *proto = Proto_GetBaseAccountName(hContact); if (!mir_strcmpi(proto, META_PROTO)) hContact = db_mc_getMostOnline(hContact); diff --git a/protocols/CloudFile/src/utils.cpp b/protocols/CloudFile/src/utils.cpp index baef1e9c65..d0cc60e963 100644 --- a/protocols/CloudFile/src/utils.cpp +++ b/protocols/CloudFile/src/utils.cpp @@ -40,7 +40,7 @@ bool CanSendToContact(MCONTACT hContact) if (!hContact) return false; - const char *proto = GetContactProto(hContact); + const char *proto = Proto_GetBaseAccountName(hContact); if (!proto) return false; @@ -65,7 +65,7 @@ bool CanSendToContact(MCONTACT hContact) void SendToContact(MCONTACT hContact, const wchar_t *data) { - const char *szProto = GetContactProto(hContact); + const char *szProto = Proto_GetBaseAccountName(hContact); if (db_get_b(hContact, szProto, "ChatRoom", 0) == TRUE) { ptrW tszChatRoom(db_get_wsa(hContact, szProto, "ChatRoomID")); Chat_SendUserMessage(szProto, tszChatRoom, data); -- cgit v1.2.3