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

2 files changed, 9 insertions, 8 deletions

diff --git a/plugins/TabSRMM/src/chat/tools.cpp b/plugins/TabSRMM/src/chat/tools.cpp
index e357842be9..6e722c597b 100644
--- a/plugins/TabSRMM/src/chat/tools.cpp
+++ b/plugins/TabSRMM/src/chat/tools.cpp
@@ -46,8 +46,8 @@ static void __stdcall Chat_DismissPopup(void *pi)
 {

 	SESSION_INFO *si = (SESSION_INFO*)pi;

 	if (si->hContact)

-		if (CallService(MS_CLIST_GETEVENT, si->hContact, 0))

-			CallServiceSync(MS_CLIST_REMOVEEVENT, si->hContact, (LPARAM)GC_FAKE_EVENT);

+		if (pcli->pfnGetEvent(si->hContact, 0))

+			pcli->pfnRemoveEvent(si->hContact, GC_FAKE_EVENT);

 

 	if (si->hWnd && KillTimer(si->hWnd, TIMERID_FLASHWND))

 		FlashWindow(si->hWnd, FALSE);

diff --git a/plugins/TabSRMM/src/chat/window.cpp b/plugins/TabSRMM/src/chat/window.cpp
index 152a9278d4..71d1aabbfe 100644
--- a/plugins/TabSRMM/src/chat/window.cpp
+++ b/plugins/TabSRMM/src/chat/window.cpp
@@ -202,8 +202,8 @@ static void Chat_UpdateWindowState(TWindowData *dat, UINT msg)
 	if (dat->iTabID >= 0) {
 		if (db_get_w(si->hContact, si->pszModule, "ApparentMode", 0) != 0)
 			db_set_w(si->hContact, si->pszModule, "ApparentMode", 0);
-		if (CallService(MS_CLIST_GETEVENT, si->hContact, 0))
-			CallService(MS_CLIST_REMOVEEVENT, si->hContact, (LPARAM)GC_FAKE_EVENT);
+		if (pcli->pfnGetEvent(si->hContact, 0))
+			pcli->pfnRemoveEvent(si->hContact, GC_FAKE_EVENT);
 
 		SendMessage(hwndDlg, GC_UPDATETITLE, 0, 1);
 		dat->dwTickLastEvent = 0;
@@ -2265,8 +2265,8 @@ INT_PTR CALLBACK RoomWndProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPar
 			return TRUE;
 
 		case SESSION_TERMINATE:
-			if (CallService(MS_CLIST_GETEVENT, si->hContact, 0))
-				CallService(MS_CLIST_REMOVEEVENT, si->hContact, (LPARAM)GC_FAKE_EVENT);
+			if (pcli->pfnGetEvent(si->hContact, 0))
+				pcli->pfnRemoveEvent(si->hContact, GC_FAKE_EVENT);
 
 			si->wState &= ~STATE_TALK;
 			dat->bWasDeleted = 1;
@@ -3422,8 +3422,9 @@ LABEL_SHOWWINDOW:
 	case WM_DESTROY:
 		if (si == NULL)
 			break;
-		if (CallService(MS_CLIST_GETEVENT, si->hContact, 0))
-			CallService(MS_CLIST_REMOVEEVENT, si->hContact, GC_FAKE_EVENT);
+
+		if (pcli->pfnGetEvent(si->hContact, 0))
+			pcli->pfnRemoveEvent(si->hContact, GC_FAKE_EVENT);
 		si->wState &= ~STATE_TALK;
 		si->hWnd = NULL;
 		si->dat = NULL;