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/ICQ-WIM/src/proto.cpp | 4 +--- protocols/ICQ-WIM/src/server.cpp | 5 ++--- 2 files changed, 3 insertions(+), 6 deletions(-) (limited to 'protocols/ICQ-WIM/src') diff --git a/protocols/ICQ-WIM/src/proto.cpp b/protocols/ICQ-WIM/src/proto.cpp index 0633783f9d..93664a6ed3 100644 --- a/protocols/ICQ-WIM/src/proto.cpp +++ b/protocols/ICQ-WIM/src/proto.cpp @@ -138,9 +138,7 @@ void CIcqProto::OnModulesLoaded() HookProtoEvent(ME_USERINFO_INITIALISE, &CIcqProto::OnUserInfoInit); // load custom smilies - CMStringW wszPath(GetAvatarPath() + L"\\Stickers\\*.png"); - SMADD_CONT cont = { SMADD_FOLDER, m_szModuleName, wszPath }; - CallService(MS_SMILEYADD_LOADCONTACTSMILEYS, 0, LPARAM(&cont)); + SmileyAdd_LoadContactSmileys(SMADD_FOLDER, m_szModuleName, GetAvatarPath() + L"\\Stickers\\*.png"); } void CIcqProto::OnShutdown() diff --git a/protocols/ICQ-WIM/src/server.cpp b/protocols/ICQ-WIM/src/server.cpp index 853e9ccde7..1af5cbd52c 100644 --- a/protocols/ICQ-WIM/src/server.cpp +++ b/protocols/ICQ-WIM/src/server.cpp @@ -201,7 +201,7 @@ bool CIcqProto::CheckFile(MCONTACT hContact, CMStringW &wszText, IcqFileInfo *&p // is it a sticker? if (pFileInfo->bIsSticker) { - if (ServiceExists(MS_SMILEYADD_LOADCONTACTSMILEYS)) { + if (ServiceExists(MS_SMILEYADD_REPLACESMILEYS)) { auto *pNew = new AsyncHttpRequest(CONN_NONE, REQUEST_GET, pFileInfo->szUrl, &CIcqProto::OnGetSticker); pNew->flags |= NLHRF_NODUMP | NLHRF_SSL | NLHRF_HTTP11 | NLHRF_REDIRECT; pNew->pUserInfo = wszUrl.GetBuffer(); @@ -1010,8 +1010,7 @@ void CIcqProto::OnGetSticker(NETLIBHTTPREQUEST *pReply, AsyncHttpRequest *pReq) fwrite(pReply->pData, 1, pReply->dataLength, out); fclose(out); - SMADD_CONT cont = { SMADD_FILE, m_szModuleName, wszFileName }; - CallService(MS_SMILEYADD_LOADCONTACTSMILEYS, 0, LPARAM(&cont)); + SmileyAdd_LoadContactSmileys(SMADD_FILE, m_szModuleName, wszFileName); } ///////////////////////////////////////////////////////////////////////////////////////// -- cgit v1.2.3