From 6cbc80198df3a18724e667743f8068eb60e23b88 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Fri, 12 Apr 2019 22:17:02 +0300 Subject: wiping custom icolib functions: all another plugins --- protocols/Omegle/src/communication.cpp | 8 ++------ protocols/Omegle/src/theme.cpp | 9 --------- protocols/Omegle/src/theme.h | 1 - 3 files changed, 2 insertions(+), 16 deletions(-) (limited to 'protocols/Omegle') diff --git a/protocols/Omegle/src/communication.cpp b/protocols/Omegle/src/communication.cpp index 7741802cd4..a7b6c7960b 100644 --- a/protocols/Omegle/src/communication.cpp +++ b/protocols/Omegle/src/communication.cpp @@ -558,18 +558,14 @@ bool Omegle_client::events() Skin_PlaySound("StrangerTyp"); ptrW who(name == "spyTyping" ? json_as_string(json_at(item, 1)) : mir_wstrdup(L"Stranger")); - Srmm_SetStatusText(parent->GetChatHandle(), - CMStringW(FORMAT, TranslateT("%s is typing."), TranslateW(who)), - IcoLib_GetIconByHandle(GetIconHandle("typing_on"))); + Srmm_SetStatusText(parent->GetChatHandle(), CMStringW(FORMAT, TranslateT("%s is typing."), TranslateW(who)), g_plugin.getIcon(IDI_TYPING_ON)); } else if (name == "stoppedTyping" || name == "spyStoppedTyping") { // Stranger stopped typing, not supported by chat module yet Skin_PlaySound("StrangerTypStop"); ptrW who(name == "spyTyping" ? json_as_string(json_at(item, 1)) : mir_wstrdup(L"Stranger")); - Srmm_SetStatusText(parent->GetChatHandle(), - CMStringW(FORMAT, TranslateT("%s stopped typing."), TranslateW(who)), - IcoLib_GetIconByHandle(GetIconHandle("typing_off"))); + Srmm_SetStatusText(parent->GetChatHandle(), CMStringW(FORMAT, TranslateT("%s stopped typing."), TranslateW(who)), g_plugin.getIcon(IDI_TYPING_OFF)); } else if (name == "gotMessage") { Srmm_SetStatusText(parent->GetChatHandle(), nullptr); diff --git a/protocols/Omegle/src/theme.cpp b/protocols/Omegle/src/theme.cpp index 7473c69c3b..d76b4f6eb5 100644 --- a/protocols/Omegle/src/theme.cpp +++ b/protocols/Omegle/src/theme.cpp @@ -33,12 +33,3 @@ void InitIcons(void) { g_plugin.registerIcon("Protocols/Omegle", iconList, "Omegle"); } - -HANDLE GetIconHandle(const char* name) -{ - for (auto &it : iconList) - if (mir_strcmp(it.szName, name) == 0) - return it.hIcolib; - - return nullptr; -} diff --git a/protocols/Omegle/src/theme.h b/protocols/Omegle/src/theme.h index 9d3116e5eb..af39882941 100644 --- a/protocols/Omegle/src/theme.h +++ b/protocols/Omegle/src/theme.h @@ -23,4 +23,3 @@ along with this program. If not, see . #pragma once void InitIcons(void); -HANDLE GetIconHandle(const char *name); -- cgit v1.2.3