From afa6a68cca2865a4d974143dc1a289e4f83a5e1c Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sun, 16 Aug 2020 14:54:26 +0300 Subject: SmileyAdd: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - major update for custom smileys APIs (cause we have no MSN, there's no need to save MCONTACT for custom smileys); - added path type = 2 to download whole folder for custom smileys; - fixes #2524 (ICQ: стикеры должны приходить как custom smileys, а не как передачи файлов); - fixes #2533 (SmileyAdd не всегда распознаёт стикеры); - fixes #2532 (Полученные стикеры пропадают при переоткрытии окна); - version bump --- plugins/TabSRMM/src/msgdlgutils.cpp | 2 +- plugins/TabSRMM/src/utils.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'plugins/TabSRMM/src') diff --git a/plugins/TabSRMM/src/msgdlgutils.cpp b/plugins/TabSRMM/src/msgdlgutils.cpp index 8edb9aa78c..5b8cc97467 100644 --- a/plugins/TabSRMM/src/msgdlgutils.cpp +++ b/plugins/TabSRMM/src/msgdlgutils.cpp @@ -267,7 +267,7 @@ int TSAPI CheckValidSmileyPack(const char *szProto, MCONTACT hContact) SMADD_INFO2 smainfo = { 0 }; smainfo.cbSize = sizeof(smainfo); smainfo.Protocolname = const_cast(szProto); - smainfo.hContact = hContact; + CallService(MS_SMILEYADD_GETINFO2, 0, (LPARAM)&smainfo); if (smainfo.ButtonIcon) DestroyIcon(smainfo.ButtonIcon); diff --git a/plugins/TabSRMM/src/utils.cpp b/plugins/TabSRMM/src/utils.cpp index f5e97fd276..10e8087c25 100644 --- a/plugins/TabSRMM/src/utils.cpp +++ b/plugins/TabSRMM/src/utils.cpp @@ -191,7 +191,7 @@ ok: smbp.Protocolname = m_cache->getActiveProto(); smbp.flag = SAFL_TCHAR | SAFL_PATH | (isSent ? SAFL_OUTGOING : 0); smbp.str = (wchar_t*)smcode.c_str(); - smbp.hContact = m_hContact; + SMADD_BATCHPARSERES *smbpr = (SMADD_BATCHPARSERES *)CallService(MS_SMILEYADD_BATCHPARSE, 0, (LPARAM)&smbp); if (smbpr) { CallService(MS_SMILEYADD_BATCHFREE, 0, (LPARAM)smbpr); -- cgit v1.2.3