From 33953cc6a0fab6a91af293c6838f8a46dd7922da Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Mon, 10 Feb 2014 14:42:51 +0000
Subject: HCONTACT, part 3

git-svn-id: http://svn.miranda-ng.org/main/trunk@8081 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/MetaContacts/src/meta_api.cpp      | 6 +++---
 plugins/MetaContacts/src/meta_menu.cpp     | 2 +-
 plugins/MetaContacts/src/meta_services.cpp | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'plugins/MetaContacts/src')

diff --git a/plugins/MetaContacts/src/meta_api.cpp b/plugins/MetaContacts/src/meta_api.cpp
index 77a09a6a4a..71cdfeb1ec 100644
--- a/plugins/MetaContacts/src/meta_api.cpp
+++ b/plugins/MetaContacts/src/meta_api.cpp
@@ -104,7 +104,7 @@ INT_PTR MetaAPI_SetDefaultContactNum(WPARAM wParam, LPARAM lParam) {
 INT_PTR MetaAPI_SetDefaultContact(WPARAM wParam, LPARAM lParam) {
 	HCONTACT hMeta = (HCONTACT)db_get_dw((HCONTACT)lParam, META_PROTO, "Handle", 0);
 	DWORD contact_number = Meta_GetContactNumber((HCONTACT)lParam);
-	if (contact_number == -1 || !hMeta || hMeta != (HANDLE)wParam) 
+	if (contact_number == -1 || !hMeta || hMeta != (HCONTACT)wParam) 
 		return 1;
 	if (db_set_dw(hMeta, META_PROTO, "Default", contact_number))
 		return 1;
@@ -120,7 +120,7 @@ INT_PTR MetaAPI_SetDefaultContact(WPARAM wParam, LPARAM lParam) {
 INT_PTR MetaAPI_ForceSendContactNum(WPARAM wParam, LPARAM lParam) {
 	HCONTACT hContact = Meta_GetContactHandle((HCONTACT)wParam, (int)lParam);
 	HCONTACT hMeta = (HCONTACT)db_get_dw(hContact, META_PROTO, "Handle", 0);
-	if (!hContact || !hMeta || hMeta != (HANDLE)wParam || db_get_b(hMeta, META_PROTO, "ForceDefault", 0)) 
+	if (!hContact || !hMeta || hMeta != (HCONTACT)wParam || db_get_b(hMeta, META_PROTO, "ForceDefault", 0)) 
 		return 1;
 
 	db_set_dw(hMeta, META_PROTO, "ForceSend", (DWORD)hContact);
@@ -136,7 +136,7 @@ INT_PTR MetaAPI_ForceSendContactNum(WPARAM wParam, LPARAM lParam) {
 INT_PTR MetaAPI_ForceSendContact(WPARAM wParam, LPARAM lParam) {
 	HCONTACT hContact = (HCONTACT)lParam;
 	HCONTACT hMeta = (HCONTACT)db_get_dw(hContact, META_PROTO, "Handle", 0);
-	if ( !hContact || !hMeta || hMeta != (HANDLE)wParam || db_get_b(hMeta, META_PROTO, "ForceDefault", 0)) 
+	if (!hContact || !hMeta || hMeta != (HCONTACT)wParam || db_get_b(hMeta, META_PROTO, "ForceDefault", 0)) 
 		return 1;
 
 	db_set_dw(hMeta, META_PROTO, "ForceSend", (DWORD)hContact);
diff --git a/plugins/MetaContacts/src/meta_menu.cpp b/plugins/MetaContacts/src/meta_menu.cpp
index 53ed386ff6..7c8ae2d560 100644
--- a/plugins/MetaContacts/src/meta_menu.cpp
+++ b/plugins/MetaContacts/src/meta_menu.cpp
@@ -117,7 +117,7 @@ void Meta_RemoveContactNumber(HCONTACT hMeta, int number)
 	HCONTACT hContact = Meta_GetContactHandle(hMeta, number);
 
 	// make sure this contact thinks it's part of this metacontact
-	if ((HANDLE)db_get_dw(hContact, META_PROTO, "Handle", 0) == hMeta) {
+	if ((HCONTACT)db_get_dw(hContact, META_PROTO, "Handle", 0) == hMeta) {
 		// remove link to meta contact
 		db_unset(hContact, META_PROTO, "IsSubcontact");
 		db_unset(hContact, META_PROTO, META_LINK);
diff --git a/plugins/MetaContacts/src/meta_services.cpp b/plugins/MetaContacts/src/meta_services.cpp
index f829412474..3851c575e0 100755
--- a/plugins/MetaContacts/src/meta_services.cpp
+++ b/plugins/MetaContacts/src/meta_services.cpp
@@ -388,7 +388,7 @@ INT_PTR MetaFilter_RecvMessage(WPARAM wParam,LPARAM lParam)
 			CLISTEVENT cle = { sizeof(cle) };
 			cle.hContact = hMeta;
 			cle.flags = CLEF_TCHAR;
-			cle.hDbEvent = ccs->hContact;	// use subcontact handle as key - then we can remove all events if the subcontact window is opened
+			cle.hDbEvent = (HANDLE)ccs->hContact;	// use subcontact handle as key - then we can remove all events if the subcontact window is opened
 			cle.hIcon = LoadSkinnedIcon(SKINICON_EVENT_MESSAGE);
 			cle.pszService = "MetaContacts/CListMessageEvent";
 			mir_sntprintf(toolTip, SIZEOF(toolTip), TranslateT("Message from %s"), pcli->pfnGetContactDisplayName(hMeta, GCDNF_TCHAR));
@@ -1124,7 +1124,7 @@ INT_PTR Meta_ContactMenuFunc(WPARAM wParam, LPARAM lParam)
 
 	} else if (options.menu_function == FT_MENU) {
 		// show contact's context menu
-		CallFunctionAsync(sttMenuThread, hContact);
+		CallFunctionAsync(sttMenuThread, (void*)hContact);
 	} else if (options.menu_function == FT_INFO) {
 		// show user info for subcontact
 		CallService(MS_USERINFO_SHOWDIALOG, (WPARAM)hContact, 0);
-- 
cgit v1.2.3