From bb5aff746c50564ded61159c5ae28e6218d0a49d Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Thu, 28 Jan 2016 16:04:16 +0000
Subject: another atavism removed: old stub services for clist events

git-svn-id: http://svn.miranda-ng.org/main/trunk@16181 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 protocols/MSN/src/msn_mail.cpp | 10 +++++-----
 protocols/MSN/src/msn_menu.cpp |  3 ++-
 protocols/MSN/src/msn_misc.cpp |  5 +++--
 protocols/MSN/src/msn_svcs.cpp |  2 +-
 4 files changed, 11 insertions(+), 9 deletions(-)

(limited to 'protocols/MSN')

diff --git a/protocols/MSN/src/msn_mail.cpp b/protocols/MSN/src/msn_mail.cpp
index 6723946566..99ea736122 100644
--- a/protocols/MSN/src/msn_mail.cpp
+++ b/protocols/MSN/src/msn_mail.cpp
@@ -282,21 +282,21 @@ void CMsnProto::sttNotificationMessage(char* msgBody, bool isInitial)
 
 	MCONTACT hContact = MSN_HContactFromEmail(MyOptions.szEmail);
 	if (hContact) {
-		CallService(MS_CLIST_REMOVEEVENT, hContact, (LPARAM)1);
+		pcli->pfnRemoveEvent(hContact, 1);
 		displayEmailCount(hContact);
 
 		if (ShowPopup && !getByte("DisableHotmailTray", 1)) {
+			char buf[64];
+			mir_snprintf(buf, "%s%s", m_szModuleName, MS_GOTO_INBOX);
+
 			CLISTEVENT cle = {};
 			cle.hContact = hContact;
 			cle.hDbEvent = 1;
 			cle.flags = CLEF_URGENT | CLEF_TCHAR;
 			cle.hIcon = Skin_LoadIcon(SKINICON_OTHER_SENDEMAIL);
 			cle.ptszTooltip = tBuffer2;
-			char buf[64];
-			mir_snprintf(buf, "%s%s", m_szModuleName, MS_GOTO_INBOX);
 			cle.pszService = buf;
-
-			CallService(MS_CLIST_ADDEVENT, hContact, (LPARAM)&cle);
+			pcli->pfnAddEvent(&cle);
 		}
 	}
 
diff --git a/protocols/MSN/src/msn_menu.cpp b/protocols/MSN/src/msn_menu.cpp
index 396e7803da..d607bb1dbb 100644
--- a/protocols/MSN/src/msn_menu.cpp
+++ b/protocols/MSN/src/msn_menu.cpp
@@ -48,7 +48,8 @@ INT_PTR CMsnProto::MsnBlockCommand(WPARAM hContact, LPARAM)
 INT_PTR CMsnProto::MsnGotoInbox(WPARAM, LPARAM)
 {
 	MCONTACT hContact = MSN_HContactFromEmail(MyOptions.szEmail);
-	if (hContact) CallService(MS_CLIST_REMOVEEVENT, hContact, (LPARAM)1);
+	if (hContact)
+		pcli->pfnRemoveEvent(hContact, 1);
 
 	MsnInvokeMyURL(true, "http://mail.live.com?rru=inbox");
 	return 0;
diff --git a/protocols/MSN/src/msn_misc.cpp b/protocols/MSN/src/msn_misc.cpp
index c170355e62..3ac46a9223 100644
--- a/protocols/MSN/src/msn_misc.cpp
+++ b/protocols/MSN/src/msn_misc.cpp
@@ -943,7 +943,8 @@ void HandlePopupData(PopupData *tData)  {
 	if (tData != NULL) {
 		if (tData->flags & MSN_HOTMAIL_POPUP) {
 			MCONTACT hContact = tData->proto->MSN_HContactFromEmail(tData->proto->MyOptions.szEmail, NULL);
-			if (hContact) CallService(MS_CLIST_REMOVEEVENT, hContact, (LPARAM)1);
+			if (hContact)
+				pcli->pfnRemoveEvent(hContact, 1);
 			if (tData->flags & MSN_ALLOW_ENTER)
 				tData->proto->MsnInvokeMyURL(true, tData->url);
 		}
@@ -956,7 +957,7 @@ void RemovePopupData(PopupData *tData) {
 	if (tData != NULL && (tData->flags & MSN_HOTMAIL_POPUP)) {
 		MCONTACT hContact = tData->proto->MSN_HContactFromEmail(tData->proto->MyOptions.szEmail, NULL);
 		if (hContact)
-			CallService(MS_CLIST_REMOVEEVENT, hContact, 1);
+			pcli->pfnRemoveEvent(hContact, 1);
 	}
 }
 
diff --git a/protocols/MSN/src/msn_svcs.cpp b/protocols/MSN/src/msn_svcs.cpp
index 70a49450bd..502ed01b46 100644
--- a/protocols/MSN/src/msn_svcs.cpp
+++ b/protocols/MSN/src/msn_svcs.cpp
@@ -393,7 +393,7 @@ int CMsnProto::OnContactDeleted(WPARAM hContact, LPARAM)
 	else {
 		char szEmail[MSN_MAX_EMAIL_LEN];
 		if (MSN_IsMeByContact(hContact, szEmail))
-			CallService(MS_CLIST_REMOVEEVENT, hContact, 1);
+			pcli->pfnRemoveEvent(hContact, 1);
 
 		if (szEmail[0]) {
 			debugLogA("Deleted Handler Email");
-- 
cgit v1.2.3