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/SkypeClassic/src/gchat.cpp | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

(limited to 'protocols/SkypeClassic/src/gchat.cpp')

diff --git a/protocols/SkypeClassic/src/gchat.cpp b/protocols/SkypeClassic/src/gchat.cpp
index dd38a9d990..9e746244b6 100644
--- a/protocols/SkypeClassic/src/gchat.cpp
+++ b/protocols/SkypeClassic/src/gchat.cpp
@@ -112,7 +112,7 @@ gchat_contact *GetChatContact(gchat_contacts *gc, const TCHAR *who) {
 static int AddChatContact(gchat_contacts *gc, char *who, TCHAR *pszRole)
 {
 	int i = -2;
-	HCONTACT hContact;
+	MCONTACT hContact;
 	CONTACTINFO ci = {0};
 	TCHAR *twho;
 
@@ -165,10 +165,10 @@ void RemChatContact(gchat_contacts *gc, const TCHAR *who) {
 		}
 }
 
-HCONTACT find_chat(LPCTSTR chatname) {
+MCONTACT find_chat(LPCTSTR chatname) {
 	char *szProto;
 	int tCompareResult;
-	HCONTACT hContact;
+	MCONTACT hContact;
 	DBVARIANT dbv;
 
 	for (hContact=db_find_first();hContact != NULL;hContact=db_find_next(hContact)) {
@@ -187,10 +187,10 @@ HCONTACT find_chat(LPCTSTR chatname) {
 }
 
 #ifdef _UNICODE
-HCONTACT find_chatA(char *chatname) {
+MCONTACT find_chatA(char *chatname) {
 	char *szProto;
 	int tCompareResult;
-	HCONTACT hContact;
+	MCONTACT hContact;
 	DBVARIANT dbv;
 
 	for (hContact=db_find_first();hContact != NULL;hContact=db_find_next(hContact)) {
@@ -479,7 +479,7 @@ void KillChatSession(GCDEST *gcd)
 void InviteUser(const TCHAR *szChatId)
 {
 	HMENU tMenu = CreatePopupMenu();
-	HCONTACT hContact = db_find_first(), hInvitedUser;
+	MCONTACT hContact = db_find_first(), hInvitedUser;
 	DBVARIANT dbv;
 	HWND tWindow;
 	POINT pt;
@@ -516,7 +516,7 @@ void InviteUser(const TCHAR *szChatId)
 	tWindow = CreateWindow(_T("EDIT"),_T(""),0,1,1,1,1,NULL,NULL,hInst,NULL);
 
 	GetCursorPos (&pt);
-	hInvitedUser = (HCONTACT)TrackPopupMenu(tMenu, TPM_NONOTIFY | TPM_LEFTALIGN | TPM_TOPALIGN | TPM_RETURNCMD, pt.x, pt.y, 0, tWindow, NULL);
+	hInvitedUser = (MCONTACT)TrackPopupMenu(tMenu, TPM_NONOTIFY | TPM_LEFTALIGN | TPM_TOPALIGN | TPM_RETURNCMD, pt.x, pt.y, 0, tWindow, NULL);
 	DestroyMenu(tMenu);
 	DestroyWindow(tWindow);
 
@@ -527,7 +527,7 @@ void InviteUser(const TCHAR *szChatId)
 
 }
 
-static void KickUser (HCONTACT hContact, GCHOOK *gch)
+static void KickUser (MCONTACT hContact, GCHOOK *gch)
 {
 	char *ptr;
 
@@ -566,7 +566,7 @@ static void KickUser (HCONTACT hContact, GCHOOK *gch)
 
 void SetChatTopic(const TCHAR *szChatId, TCHAR *szTopic, BOOL bSet)
 {
-	HCONTACT hContact = find_chat (szChatId);
+	MCONTACT hContact = find_chat (szChatId);
 	char *szUTFTopic;
 
 	GCDEST gcd = { SKYPE_PROTONAME, szChatId, GC_EVENT_TOPIC };
@@ -608,7 +608,7 @@ int GCEventHook(WPARAM wParam,LPARAM lParam) {
 
 			switch (gch->pDest->iType) {
 			case GC_SESSION_TERMINATE: {
-				HCONTACT hContact;
+				MCONTACT hContact;
 
 				if (gc->mJoinedCount == 1) {
 					// switch back to normal session
@@ -691,7 +691,7 @@ int GCEventHook(WPARAM wParam,LPARAM lParam) {
 				InviteUser(gch->pDest->ptszID);
 				break;
 			case GC_USER_PRIVMESS: {
-				HCONTACT hContact = find_contactT(gch->ptszUID);
+				MCONTACT hContact = find_contactT(gch->ptszUID);
 				if (hContact) CallService(MS_MSG_SENDMESSAGE, (WPARAM)hContact, 0);
 				break;
 
@@ -714,7 +714,7 @@ int GCEventHook(WPARAM wParam,LPARAM lParam) {
 				}
 				break;
 			case GC_USER_NICKLISTMENU: {
-				HCONTACT hContact = find_contactT(gch->ptszUID);
+				MCONTACT hContact = find_contactT(gch->ptszUID);
 
 				switch(gch->dwData) {
 				case 10:CallService(MS_USERINFO_SHOWDIALOG, (WPARAM)hContact, 0); break;
@@ -821,7 +821,7 @@ int __cdecl  GCMenuHook(WPARAM wParam,LPARAM lParam) {
 
 INT_PTR GCOnLeaveChat(WPARAM wParam,LPARAM lParam)
 {
-	HCONTACT hContact = (HCONTACT)wParam;
+	MCONTACT hContact = (MCONTACT)wParam;
 	DBVARIANT dbv;
 
 	UNREFERENCED_PARAMETER(lParam);
@@ -837,7 +837,7 @@ INT_PTR GCOnLeaveChat(WPARAM wParam,LPARAM lParam)
  
 INT_PTR GCOnJoinChat(WPARAM wParam,LPARAM lParam)
 {
-	HCONTACT hContact = (HCONTACT)wParam;
+	MCONTACT hContact = (MCONTACT)wParam;
 	DBVARIANT dbv;
 
 	UNREFERENCED_PARAMETER(lParam);
-- 
cgit v1.2.3