From be005fdd7a3a801ec698dc211cd2e0dd80030fb6 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Thu, 26 Oct 2023 16:00:06 +0300 Subject: SmileyAdd_LoadContactSmileys - helper function for adding custom smileys --- protocols/Telegram/src/avatars.cpp | 3 +-- protocols/Telegram/src/proto.cpp | 9 +++------ 2 files changed, 4 insertions(+), 8 deletions(-) (limited to 'protocols/Telegram/src') diff --git a/protocols/Telegram/src/avatars.cpp b/protocols/Telegram/src/avatars.cpp index 11646a681d..89d3ef98e0 100644 --- a/protocols/Telegram/src/avatars.cpp +++ b/protocols/Telegram/src/avatars.cpp @@ -193,8 +193,7 @@ void CTelegramProto::ProcessFile(TD::updateFile *pObj) } else MoveFileW(wszExistingFile, wszFullName); - SMADD_CONT cont = { SMADD_FILE, m_szModuleName, wszFullName }; - CallService(MS_SMILEYADD_LOADCONTACTSMILEYS, 0, LPARAM(&cont)); + SmileyAdd_LoadContactSmileys(SMADD_FILE, m_szModuleName, wszFullName); mir_cslock lck(m_csFiles); m_arFiles.remove(F); diff --git a/protocols/Telegram/src/proto.cpp b/protocols/Telegram/src/proto.cpp index 61ecf9c132..e6de52e581 100644 --- a/protocols/Telegram/src/proto.cpp +++ b/protocols/Telegram/src/proto.cpp @@ -150,12 +150,9 @@ void CTelegramProto::OnModulesLoaded() } setByte(DBKEY_COMPAT, 3); - m_bSmileyAdd = ServiceExists(MS_SMILEYADD_LOADCONTACTSMILEYS); - if (m_bSmileyAdd) { - CMStringW wszStickersPath(GetAvatarPath() + L"\\Stickers\\*.*"); - SMADD_CONT cont = { SMADD_FOLDER, m_szModuleName, wszStickersPath }; - CallService(MS_SMILEYADD_LOADCONTACTSMILEYS, 0, LPARAM(&cont)); - } + m_bSmileyAdd = ServiceExists(MS_SMILEYADD_REPLACESMILEYS); + if (m_bSmileyAdd) + SmileyAdd_LoadContactSmileys(SMADD_FOLDER, m_szModuleName, GetAvatarPath() + L"\\Stickers\\*.*"); } void CTelegramProto::OnShutdown() -- cgit v1.2.3