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
---
 protocols/MSN/src/msn_menu.cpp | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

(limited to 'protocols/MSN/src/msn_menu.cpp')

diff --git a/protocols/MSN/src/msn_menu.cpp b/protocols/MSN/src/msn_menu.cpp
index e9e6cf3b1a..f36fccd9e2 100644
--- a/protocols/MSN/src/msn_menu.cpp
+++ b/protocols/MSN/src/msn_menu.cpp
@@ -33,7 +33,7 @@ HANDLE hNetMeeting, hBlockCom, hSendHotMail, hInviteChat, hViewProfile;
 INT_PTR CMsnProto::MsnBlockCommand(WPARAM wParam, LPARAM)
 {
 	if (msnLoggedIn) {
-		HCONTACT hContact = (HCONTACT)wParam;
+		MCONTACT hContact = (MCONTACT)wParam;
 
 		char tEmail[MSN_MAX_EMAIL_LEN];
 		db_get_static(hContact, m_szModuleName, "e-mail", tEmail, sizeof(tEmail));
@@ -51,7 +51,7 @@ INT_PTR CMsnProto::MsnBlockCommand(WPARAM wParam, LPARAM)
 
 INT_PTR CMsnProto::MsnGotoInbox(WPARAM, LPARAM)
 {
-	HCONTACT hContact = MSN_HContactFromEmail(MyOptions.szEmail);
+	MCONTACT hContact = MSN_HContactFromEmail(MyOptions.szEmail);
 	if (hContact) CallService(MS_CLIST_REMOVEEVENT, (WPARAM)hContact, (LPARAM) 1);
 
 	MsnInvokeMyURL(true, "http://mail.live.com?rru=inbox");
@@ -60,7 +60,7 @@ INT_PTR CMsnProto::MsnGotoInbox(WPARAM, LPARAM)
 
 INT_PTR CMsnProto::MsnSendHotmail(WPARAM wParam, LPARAM)
 {
-	HCONTACT hContact = (HCONTACT)wParam;
+	MCONTACT hContact = (MCONTACT)wParam;
 	char szEmail[MSN_MAX_EMAIL_LEN];
 
 	if (MSN_IsMeByContact(hContact, szEmail))
@@ -85,7 +85,7 @@ INT_PTR CMsnProto::MsnSetupAlerts(WPARAM, LPARAM)
 
 INT_PTR CMsnProto::MsnViewProfile(WPARAM wParam, LPARAM)
 {
-	HCONTACT hContact = (HCONTACT)wParam;
+	MCONTACT hContact = (MCONTACT)wParam;
 	char buf[64], *cid;
 
 	if (hContact == NULL)
@@ -127,7 +127,7 @@ INT_PTR CMsnProto::MsnInviteCommand(WPARAM, LPARAM)
 
 int CMsnProto::OnPrebuildContactMenu(WPARAM wParam, LPARAM)
 {
-	HCONTACT hContact = (HCONTACT)wParam;
+	MCONTACT hContact = (MCONTACT)wParam;
 	char szEmail[MSN_MAX_EMAIL_LEN];
 
 	if ( !MSN_IsMyContact(hContact))
@@ -157,7 +157,7 @@ int CMsnProto::OnPrebuildContactMenu(WPARAM wParam, LPARAM)
 
 int CMsnProto::OnContactDoubleClicked(WPARAM wParam, LPARAM)
 {
-	HCONTACT hContact = (HCONTACT)wParam;
+	MCONTACT hContact = (MCONTACT)wParam;
 
 	if (emailEnabled && MSN_IsMeByContact(hContact)) {
 		MsnSendHotmail(wParam, 0);
@@ -173,7 +173,7 @@ INT_PTR CMsnProto::MsnSendNetMeeting(WPARAM wParam, LPARAM)
 {
 	if (!msnLoggedIn) return 0;
 
-	HCONTACT hContact = HCONTACT(wParam);
+	MCONTACT hContact = MCONTACT(wParam);
 
 	char szEmail[MSN_MAX_EMAIL_LEN];
 	if (MSN_IsMeByContact(hContact, szEmail)) return 0;
@@ -359,7 +359,7 @@ void CMsnProto::MSN_EnableMenuItems(bool bEnable)
 
 //////////////////////////////////////////////////////////////////////////////////////
 
-static CMsnProto* GetProtoInstanceByHContact(HCONTACT hContact)
+static CMsnProto* GetProtoInstanceByHContact(MCONTACT hContact)
 {
 	char* szProto = GetContactProto(hContact);
 	if (szProto == NULL)
@@ -374,31 +374,31 @@ static CMsnProto* GetProtoInstanceByHContact(HCONTACT hContact)
 
 static INT_PTR MsnMenuBlockCommand(WPARAM wParam, LPARAM lParam)
 {
-	CMsnProto* ppro = GetProtoInstanceByHContact((HCONTACT)wParam);
+	CMsnProto* ppro = GetProtoInstanceByHContact((MCONTACT)wParam);
 	return (ppro) ? ppro->MsnBlockCommand(wParam, lParam) : 0;
 }
 
 static INT_PTR MsnMenuViewProfile(WPARAM wParam, LPARAM lParam)
 {
-	CMsnProto* ppro = GetProtoInstanceByHContact((HCONTACT)wParam);
+	CMsnProto* ppro = GetProtoInstanceByHContact((MCONTACT)wParam);
 	return (ppro) ? ppro->MsnViewProfile(wParam, lParam) : 0;
 }
 
 static INT_PTR MsnMenuSendNetMeeting(WPARAM wParam, LPARAM lParam)
 {
-	CMsnProto* ppro = GetProtoInstanceByHContact((HCONTACT)wParam);
+	CMsnProto* ppro = GetProtoInstanceByHContact((MCONTACT)wParam);
 	return (ppro) ? ppro->MsnSendNetMeeting(wParam, lParam) : 0;
 }
 
 static INT_PTR MsnMenuSendHotmail(WPARAM wParam, LPARAM lParam)
 {
-	CMsnProto* ppro = GetProtoInstanceByHContact((HCONTACT)wParam);
+	CMsnProto* ppro = GetProtoInstanceByHContact((MCONTACT)wParam);
 	return (ppro) ? ppro->MsnSendHotmail(wParam, lParam) : 0;
 }
 
 static int MSN_OnPrebuildContactMenu(WPARAM wParam, LPARAM lParam)
 {
-	CMsnProto* ppro = GetProtoInstanceByHContact((HCONTACT)wParam);
+	CMsnProto* ppro = GetProtoInstanceByHContact((MCONTACT)wParam);
 	if (ppro)
 		ppro->OnPrebuildContactMenu(wParam, lParam);
 	else {
-- 
cgit v1.2.3