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/contacts.cpp | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

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

diff --git a/protocols/SkypeClassic/src/contacts.cpp b/protocols/SkypeClassic/src/contacts.cpp
index 127f962792..ecc6902397 100644
--- a/protocols/SkypeClassic/src/contacts.cpp
+++ b/protocols/SkypeClassic/src/contacts.cpp
@@ -151,7 +151,7 @@ CLISTMENUITEM ChatInitItem(void) {
 	return mi;
 }
 
-HANDLE add_contextmenu(HCONTACT hContact) {
+HANDLE add_contextmenu(MCONTACT hContact) {
 	CLISTMENUITEM mi;
 	
 	UNREFERENCED_PARAMETER(hContact);
@@ -225,8 +225,8 @@ int __cdecl  PrebuildContactMenu(WPARAM wParam, LPARAM lParam) {
 
 	if (!strcmp(szProto, SKYPE_PROTONAME)) {
 		if (!HasVoiceService()) {
-			if (!db_get((HCONTACT)wParam, SKYPE_PROTONAME, "CallId", &dbv)) {
-				if (db_get_b((HCONTACT)wParam, SKYPE_PROTONAME, "OnHold", 0))
+			if (!db_get((MCONTACT)wParam, SKYPE_PROTONAME, "CallId", &dbv)) {
+				if (db_get_b((MCONTACT)wParam, SKYPE_PROTONAME, "OnHold", 0))
 					mi=ResumeCallItem(); else mi=HoldCallItem();
 				mi.flags=CMIM_ALL;
 				CallService(MS_CLIST_MODIFYMENUITEM, (WPARAM)(HANDLE)hMenuHoldCallItem,(LPARAM)&mi);
@@ -237,7 +237,7 @@ int __cdecl  PrebuildContactMenu(WPARAM wParam, LPARAM lParam) {
 				db_free(&dbv);
 			} else { callAvailable = TRUE; hangupAvailable = FALSE; }
         
-			if (db_get_b((HCONTACT)wParam, SKYPE_PROTONAME, "ChatRoom", 0)!=0) {
+			if (db_get_b((MCONTACT)wParam, SKYPE_PROTONAME, "ChatRoom", 0)!=0) {
 				callAvailable = FALSE;
 				hangupAvailable = FALSE;
 			}
@@ -259,7 +259,7 @@ int __cdecl  PrebuildContactMenu(WPARAM wParam, LPARAM lParam) {
 		// File sending and groupchat-creation works starting with protocol version 5
 		if (protocol>=5) {
 			mi=FileTransferItem();
-            if (db_get_b((HCONTACT)wParam, SKYPE_PROTONAME, "ChatRoom", 0)==0)
+            if (db_get_b((MCONTACT)wParam, SKYPE_PROTONAME, "ChatRoom", 0)==0)
 			    mi.flags ^= CMIF_HIDDEN;
 			mi.flags |= CMIM_FLAGS;
 			CallService(MS_CLIST_MODIFYMENUITEM, (WPARAM)(HANDLE)hMenuFileTransferItem,(LPARAM)&mi);           
@@ -268,19 +268,19 @@ int __cdecl  PrebuildContactMenu(WPARAM wParam, LPARAM lParam) {
 		if (protocol>=5 || bIsImoproxy) {
             mi=ChatInitItem();
 			if (db_get_b(NULL, SKYPE_PROTONAME, "UseGroupchat", 0) &&
-				db_get_b((HCONTACT)wParam, SKYPE_PROTONAME, "ChatRoom", 0)==0)
+				db_get_b((MCONTACT)wParam, SKYPE_PROTONAME, "ChatRoom", 0)==0)
 					mi.flags ^= CMIF_HIDDEN;
 			mi.flags |= CMIM_FLAGS;
 			CallService(MS_CLIST_MODIFYMENUITEM, (WPARAM)(HANDLE)hMenuChatInitItem,(LPARAM)&mi);
 		}
 
 	} else if (bSkypeOut) {
-		if (!db_get((HCONTACT)wParam, SKYPE_PROTONAME, "CallId", &dbv)) {
+		if (!db_get((MCONTACT)wParam, SKYPE_PROTONAME, "CallId", &dbv)) {
 			mi=SkypeOutHupItem();
 			db_free(&dbv);
 		} else {
 			mi=SkypeOutCallItem();
-			if(!db_get((HCONTACT)wParam,"UserInfo","MyPhone0",&dbv)) {
+			if(!db_get((MCONTACT)wParam,"UserInfo","MyPhone0",&dbv)) {
 				db_free(&dbv);
 				mi.flags=0;
 			}
@@ -306,13 +306,13 @@ int ClistDblClick(WPARAM wParam, LPARAM lParam) {
 }
 */
 
-HCONTACT find_contact(char *name)
+MCONTACT find_contact(char *name)
 {
 	int tCompareResult;
 	DBVARIANT dbv;
 
 	// already on list?
-	for (HCONTACT hContact = db_find_first(); hContact != NULL; hContact=db_find_next(hContact)) 
+	for (MCONTACT hContact = db_find_first(); hContact != NULL; hContact=db_find_next(hContact)) 
 	{
 		char *szProto = (char*)CallService( MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)hContact, 0 );
 		if (szProto!=NULL && !strcmp(szProto, SKYPE_PROTONAME) &&	db_get_b(hContact, SKYPE_PROTONAME, "ChatRoom", 0)==0)	
@@ -327,13 +327,13 @@ HCONTACT find_contact(char *name)
 	return NULL;
 }
 
-HCONTACT find_contactT(TCHAR *name)
+MCONTACT find_contactT(TCHAR *name)
 {
 	int tCompareResult;
 	DBVARIANT dbv;
 
 	// already on list?
-	for (HCONTACT hContact=db_find_first(); hContact != NULL; hContact=db_find_next(hContact)) 
+	for (MCONTACT hContact=db_find_first(); hContact != NULL; hContact=db_find_next(hContact)) 
 	{
 		char *szProto = (char*)CallService( MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)hContact, 0 );
 		if (szProto!=NULL && !strcmp(szProto, SKYPE_PROTONAME) &&	db_get_b(hContact, SKYPE_PROTONAME, "ChatRoom", 0)==0)	
@@ -349,9 +349,9 @@ HCONTACT find_contactT(TCHAR *name)
 }
 
 
-HCONTACT add_contact(char *name, DWORD flags)
+MCONTACT add_contact(char *name, DWORD flags)
 {
-	HCONTACT hContact;
+	MCONTACT hContact;
 
 	// already on list?
 	if (hContact=find_contact(name)) {
@@ -365,7 +365,7 @@ HCONTACT add_contact(char *name, DWORD flags)
 	// no, so add
 	
 	LOG(("add_contact: Adding %s", name));
-	hContact=(HCONTACT)CallServiceSync(MS_DB_CONTACT_ADD, 0, 0);
+	hContact=(MCONTACT)CallServiceSync(MS_DB_CONTACT_ADD, 0, 0);
 	if (hContact) {
 		if (CallServiceSync(MS_PROTO_ADDTOCONTACT, (WPARAM)hContact,(LPARAM)SKYPE_PROTONAME)!=0) {
 			LOG(("add_contact: Ouch! MS_PROTO_ADDTOCONTACT failed for some reason"));
@@ -387,7 +387,7 @@ HCONTACT add_contact(char *name, DWORD flags)
 }
 
 void logoff_contacts(BOOL bCleanup) {
-	HCONTACT hContact;
+	MCONTACT hContact;
 	char *szProto;
 	DBVARIANT dbv={0};
 
-- 
cgit v1.2.3