From 226f2fceddb5b81d5ba7a16729b4f07e53cfafb4 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Fri, 27 Sep 2019 14:40:29 +0300 Subject: obsolete services from m_ignore.h converted into functions --- plugins/SeenPlugin/src/missed.cpp | 2 +- plugins/SeenPlugin/src/utils.cpp | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) (limited to 'plugins/SeenPlugin') diff --git a/plugins/SeenPlugin/src/missed.cpp b/plugins/SeenPlugin/src/missed.cpp index 2faa45bea6..ed5858e88f 100644 --- a/plugins/SeenPlugin/src/missed.cpp +++ b/plugins/SeenPlugin/src/missed.cpp @@ -123,7 +123,7 @@ int Test(WPARAM wparam, LPARAM lparam) if (lparam < ICON_OFFLINE || lparam > ICON_INVIS) return 0; - if (CallService(MS_IGNORE_ISIGNORED, wparam, IGNOREEVENT_USERONLINE)) + if (Ignore_IsIgnored(wparam, IGNOREEVENT_USERONLINE)) return 0; if (g_plugin.getByte((MCONTACT)wparam, "Missed", 0) == 2) diff --git a/plugins/SeenPlugin/src/utils.cpp b/plugins/SeenPlugin/src/utils.cpp index 0bb0111924..a4e37838ea 100644 --- a/plugins/SeenPlugin/src/utils.cpp +++ b/plugins/SeenPlugin/src/utils.cpp @@ -436,7 +436,7 @@ LRESULT CALLBACK PopupDlgProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lPa void ShowPopup(MCONTACT hcontact, const char * lpzProto, int newStatus) { - if (CallService(MS_IGNORE_ISIGNORED, (WPARAM)hcontact, IGNOREEVENT_USERONLINE)) + if (Ignore_IsIgnored(hcontact, IGNOREEVENT_USERONLINE)) return; if (!g_plugin.getByte("UsePopups", 0) || !Clist_IsHidden(hcontact)) @@ -470,8 +470,10 @@ void ShowPopup(MCONTACT hcontact, const char * lpzProto, int newStatus) void myPlaySound(MCONTACT hcontact, WORD newStatus, WORD oldStatus) { - if (CallService(MS_IGNORE_ISIGNORED, (WPARAM)hcontact, IGNOREEVENT_USERONLINE)) return; - //oldStatus and hcontact are not used yet + if (Ignore_IsIgnored(hcontact, IGNOREEVENT_USERONLINE)) + return; + + // oldStatus and hcontact are not used yet char *soundname = nullptr; if ((newStatus == ID_STATUS_ONLINE) || (newStatus == ID_STATUS_FREECHAT)) soundname = "LastSeenTrackedStatusOnline"; else if (newStatus == ID_STATUS_OFFLINE) soundname = "LastSeenTrackedStatusOffline"; -- cgit v1.2.3