From 0a2bac03e5bae0e72f02dbb1c6c56b8ab3822024 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Wed, 27 Nov 2024 16:39:44 +0300 Subject: SmileyAdd: another atavism removed --- plugins/SmileyAdd/src/services.cpp | 40 -------------------------------------- 1 file changed, 40 deletions(-) (limited to 'plugins/SmileyAdd') diff --git a/plugins/SmileyAdd/src/services.cpp b/plugins/SmileyAdd/src/services.cpp index efc8e2cb10..f7419c7b77 100644 --- a/plugins/SmileyAdd/src/services.cpp +++ b/plugins/SmileyAdd/src/services.cpp @@ -107,44 +107,6 @@ static INT_PTR ReplaceSmileysCommand(WPARAM, LPARAM lParam) ///////////////////////////////////////////////////////////////////////////////////////// -static int GetInfoCommandE(SMADD_INFO *smre, bool retDup) -{ - if (smre == nullptr) - return FALSE; - - SmileyPackType *SmileyPack = FindSmileyPack(smre->Protocolname); - if (SmileyPack == nullptr || SmileyPack->SmileyCount() == 0) { - smre->ButtonIcon = nullptr; - smre->NumberOfSmileys = 0; - smre->NumberOfVisibleSmileys = 0; - return FALSE; - } - - SmileyType *sml = FindButtonSmiley(SmileyPack); - - if (sml != nullptr) - smre->ButtonIcon = retDup ? sml->GetIconDup() : sml->GetIcon(); - else - smre->ButtonIcon = GetDefaultIcon(retDup); - - smre->NumberOfSmileys = SmileyPack->SmileyCount(); - smre->NumberOfVisibleSmileys = SmileyPack->VisibleSmileyCount(); - - return TRUE; -} - -static INT_PTR GetInfoCommand(WPARAM, LPARAM lParam) -{ - return GetInfoCommandE((SMADD_INFO*)lParam, false); -} - -static INT_PTR GetInfoCommand2(WPARAM, LPARAM lParam) -{ - return GetInfoCommandE((SMADD_INFO*)lParam, true); -} - -///////////////////////////////////////////////////////////////////////////////////////// - static INT_PTR ParseTextBatch(WPARAM, LPARAM lParam) { SMADD_BATCHPARSE *smre = (SMADD_BATCHPARSE*)lParam; @@ -406,8 +368,6 @@ void InitServices() HookEvent(ME_CLIST_PREBUILDCONTACTMENU, RebuildContactMenu); CreateServiceFunction(MS_SMILEYADD_REPLACESMILEYS, ReplaceSmileysCommand); - CreateServiceFunction(MS_SMILEYADD_GETINFO, GetInfoCommand); - CreateServiceFunction(MS_SMILEYADD_GETINFO2, GetInfoCommand2); CreateServiceFunction(MS_SMILEYADD_REGISTERCATEGORY, RegisterPack); CreateServiceFunction(MS_SMILEYADD_BATCHPARSE, ParseTextBatch); CreateServiceFunction(MS_SMILEYADD_BATCHFREE, FreeTextBatch); -- cgit v1.2.3