From 68d3fd47bb9b75e65859d14199ffee01f16ac9a7 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Mon, 10 Feb 2014 20:47:51 +0000
Subject: HCONTACT is not needed anymore

git-svn-id: http://svn.miranda-ng.org/main/trunk@8086 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/Popup/src/popup_wnd2.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'plugins/Popup/src/popup_wnd2.cpp')

diff --git a/plugins/Popup/src/popup_wnd2.cpp b/plugins/Popup/src/popup_wnd2.cpp
index 0a04b15a54..6a9a5a9b8b 100644
--- a/plugins/Popup/src/popup_wnd2.cpp
+++ b/plugins/Popup/src/popup_wnd2.cpp
@@ -933,17 +933,17 @@ LRESULT CALLBACK NullWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM l
 struct ReplyEditData
 {
 	HWND hwndPopup;
-	HCONTACT hContact;
+	MCONTACT hContact;
 	WNDPROC oldWndProc;
 };
 
-BOOL	IsUtfSendAvailable(HCONTACT hContact)
+BOOL	IsUtfSendAvailable(MCONTACT hContact)
 {
 	char* szProto = GetContactProto(hContact);
 	if (szProto == NULL) return FALSE;
 	//check for MetaContact and get szProto from subcontact
 	if (strcmp(szProto, gszMetaProto)==0) {
-		HCONTACT hSubContact = (HCONTACT)CallService(MS_MC_GETDEFAULTCONTACT, (WPARAM)hContact, 0);
+		MCONTACT hSubContact = (MCONTACT)CallService(MS_MC_GETDEFAULTCONTACT, (WPARAM)hContact, 0);
 		if (!hSubContact)
 			return FALSE;
 		szProto = GetContactProto(hSubContact);
@@ -951,7 +951,7 @@ BOOL	IsUtfSendAvailable(HCONTACT hContact)
 	return(CallProtoService(szProto, PS_GETCAPS, PFLAGNUM_4, 0) & PF4_IMSENDUTF) ? TRUE : FALSE;
 }
 
-void	AddMessageToDB(HCONTACT hContact, char *msg, int flag/*bool utf*/)
+void	AddMessageToDB(MCONTACT hContact, char *msg, int flag/*bool utf*/)
 {
 	DBEVENTINFO dbei = {0};
 	dbei.cbSize = sizeof(dbei);
@@ -1078,7 +1078,7 @@ LRESULT CALLBACK PopupWnd2::WindowProc(UINT message, WPARAM wParam, LPARAM lPara
 		break;
 
 	case UM_AVATARCHANGED:
-		if ((HCONTACT)wParam == m_hContact)
+		if ((MCONTACT)wParam == m_hContact)
 		{
 			m_avatar->invalidate();
 			update();
@@ -1492,13 +1492,13 @@ void	WindowThread(void *arg)
 // Menu Host
 LRESULT CALLBACK MenuHostWndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
 {
-	static HCONTACT hContact = NULL;
+	static MCONTACT hContact = NULL;
 
 	switch (message)
 	{
 		case UM_SHOWMENU:
 		{
-			hContact = (HCONTACT)lParam;
+			hContact = (MCONTACT)lParam;
 			POINT pt = {0};
 			HMENU hMenu = (HMENU)CallService(MS_CLIST_MENUBUILDCONTACT,(WPARAM)hContact,0);
 			GetCursorPos(&pt);
-- 
cgit v1.2.3