From 2be5844edd93ab3490b4689cad33d75b4c77f3a8 Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Tue, 28 Mar 2017 15:38:49 +0300
Subject: and finally MS_MSG_GETWINDOWDATA has gone, zihrono levraha

---
 plugins/NewEventNotify/src/main.cpp | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

(limited to 'plugins/NewEventNotify')

diff --git a/plugins/NewEventNotify/src/main.cpp b/plugins/NewEventNotify/src/main.cpp
index 81a8e51d63..d2b07adf78 100644
--- a/plugins/NewEventNotify/src/main.cpp
+++ b/plugins/NewEventNotify/src/main.cpp
@@ -24,7 +24,6 @@
 
 #include "stdafx.h"
 
-int g_IsSrmmWindowAPI = 0;
 extern PLUGIN_DATA* PopupList[20];
 
 //---------------------------
@@ -113,8 +112,6 @@ int HookedInit(WPARAM, LPARAM)
 
 	if (pluginOptions.bMenuitem)
 		MenuitemInit(!pluginOptions.bDisable);
-
-	g_IsSrmmWindowAPI = ServiceExists(MS_MSG_GETWINDOWDATA) != 0;
 	return 0;
 }
 
@@ -169,12 +166,10 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD, LPVOID)
 
 int CheckMsgWnd(MCONTACT hContact)
 {
-	if (g_IsSrmmWindowAPI) {
-		MessageWindowData mwd;
-		if (!CallService(MS_MSG_GETWINDOWDATA, hContact, (LPARAM)&mwd))
-			if (mwd.hwndWindow != NULL && (mwd.uState & MSG_WINDOW_STATE_EXISTS))
-				return 1;
-	}
+	MessageWindowData mwd;
+	if (!Srmm_GetWindowData(hContact, mwd))
+		if (mwd.hwndWindow != NULL && (mwd.uState & MSG_WINDOW_STATE_EXISTS))
+			return 1;
 
 	return 0;
 }
-- 
cgit v1.2.3