- HANDLE hContact => HCONTACT

- GCF_* prefix was added to chat constants to avoid name conflicts

git-svn-id: http://svn.miranda-ng.org/main/trunk@8078 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

1 files changed, 62 insertions, 75 deletions

diff --git a/plugins/MetaContacts/src/meta_services.cpp b/plugins/MetaContacts/src/meta_services.cpp
index 2f5aad2654..f829412474 100755
--- a/plugins/MetaContacts/src/meta_services.cpp
+++ b/plugins/MetaContacts/src/meta_services.cpp
@@ -190,10 +190,10 @@ INT_PTR Meta_GetStatus(WPARAM wParam,LPARAM lParam)
 

 struct TFakeAckParams

 {

-	HANDLE	hEvent;

-	HANDLE	hContact;

-	LONG		id;

-	char	msg[512];

+	HANDLE hEvent;

+	HCONTACT hContact;

+	LONG id;

+	char msg[512];

 };

 

 static DWORD CALLBACK sttFakeAckFail( LPVOID param )

@@ -202,7 +202,7 @@ static DWORD CALLBACK sttFakeAckFail( LPVOID param )
 	WaitForSingleObject( tParam->hEvent, INFINITE );

 

 	Sleep( 100 );

-	ProtoBroadcastAck(META_PROTO, tParam->hContact, ACKTYPE_MESSAGE, ACKRESULT_FAILED, ( HANDLE )tParam->id, (WPARAM)tParam->msg );

+	ProtoBroadcastAck(META_PROTO, tParam->hContact, ACKTYPE_MESSAGE, ACKRESULT_FAILED, (HANDLE)tParam->id, (WPARAM)tParam->msg );

 

 	CloseHandle( tParam->hEvent );

 	mir_free(tParam);

@@ -222,9 +222,9 @@ static DWORD CALLBACK sttFakeAckFail( LPVOID param )
 INT_PTR MetaFilter_SendMessage(WPARAM wParam,LPARAM lParam)

 {

 	CCSDATA *ccs = (CCSDATA*)lParam;

-	HANDLE hMeta;

+	HCONTACT hMeta;

 

-	if ((hMeta = (HANDLE)db_get_dw(ccs->hContact, META_PROTO, "Handle", 0)) == 0)

+	if ((hMeta = (HCONTACT)db_get_dw(ccs->hContact, META_PROTO, "Handle", 0)) == 0)

 		return CallService(MS_PROTO_CHAINSEND, wParam, lParam); // Can't find the MetaID of the metacontact linked to

 

 	// if subcontact sending, add db event to keep metacontact history correct

@@ -261,7 +261,7 @@ INT_PTR MetaFilter_SendMessage(WPARAM wParam,LPARAM lParam)
 

 INT_PTR Meta_SendNudge(WPARAM wParam,LPARAM lParam)

 {

-	HANDLE hSubContact = Meta_GetMostOnline((HANDLE)wParam);

+	HCONTACT hSubContact = Meta_GetMostOnline((HCONTACT)wParam);

 	return ProtoCallService(GetContactProto(hSubContact), PS_SEND_NUDGE, (WPARAM)hSubContact, lParam);

 }

 

@@ -289,7 +289,7 @@ INT_PTR Meta_SendMessage(WPARAM wParam,LPARAM lParam)
 		return CallService(MS_PROTO_CHAINSEND, wParam, lParam);

 	}

 

-	HANDLE most_online = Meta_GetMostOnline(ccs->hContact);

+	HCONTACT most_online = Meta_GetMostOnline(ccs->hContact);

 

 	if ( !most_online) {

 		DWORD dwThreadId;

@@ -359,10 +359,10 @@ INT_PTR MetaFilter_RecvMessage(WPARAM wParam,LPARAM lParam)
 	DBEVENTINFO dbei;

 	CCSDATA *ccs = (CCSDATA*)lParam;

 	PROTORECVEVENT *pre = (PROTORECVEVENT *) ccs->lParam;

-	HANDLE hMeta;

+	HCONTACT hMeta;

 

 	// Can't find the MetaID of the metacontact linked to this contact, let through the protocol chain

-	if ((hMeta = (HANDLE)db_get_dw(ccs->hContact, META_PROTO, "Handle", 0)) == 0)

+	if ((hMeta = (HCONTACT)db_get_dw(ccs->hContact, META_PROTO, "Handle", 0)) == 0)

 		return CallService(MS_PROTO_CHAINRECV, wParam, (LPARAM)ccs);

 

 	if (options.set_default_on_recv) {

@@ -404,7 +404,7 @@ INT_PTR MetaFilter_RecvMessage(WPARAM wParam,LPARAM lParam)
 				// use the subcontact's protocol 'recv' service to add the meta's history (AIMOSCAR removes HTML here!) if possible

 				char *proto = GetContactProto(ccs->hContact);

 				if (proto) {

-					HANDLE hSub = ccs->hContact;

+					HCONTACT hSub = ccs->hContact;

 					DWORD flags = pre->flags;

 					ccs->hContact = hMeta;

 					pre->flags |= (db_get_b(hMeta, META_PROTO, "WindowOpen", 0) ? 0 : PREF_CREATEREAD);

@@ -437,7 +437,7 @@ INT_PTR MetaFilter_RecvMessage(WPARAM wParam,LPARAM lParam)
 		return CallService(MS_PROTO_CHAINRECV, wParam, (LPARAM)ccs);

 	}

 

-	HANDLE hSub = ccs->hContact;

+	HCONTACT hSub = ccs->hContact;

 	ccs->hContact = hMeta;	// Forward to the associated MetaContact.

 	CallService(MS_PROTO_CHAINRECV, 0, (LPARAM)ccs);

 	ccs->hContact = hSub;

@@ -467,7 +467,7 @@ INT_PTR Meta_RecvMessage(WPARAM wParam, LPARAM lParam)
 

 	if (options.use_proto_recv) {

 		// use the subcontact's protocol to add the db if possible (AIMOSCAR removes HTML here!)

-		HANDLE most_online = Meta_GetMostOnline(ccs->hContact);

+		HCONTACT most_online = Meta_GetMostOnline(ccs->hContact);

 		if (char *subProto = GetContactProto(most_online))

 			if ( ProtoCallService(subProto, PSR_MESSAGE, wParam, lParam) != CALLSERVICE_NOTFOUND)

 				return 0;

@@ -503,9 +503,9 @@ information about the ACK.
 int Meta_HandleACK(WPARAM wParam, LPARAM lParam)

 {

 	ACKDATA *ack = (ACKDATA*) lParam;

-	HANDLE hUser;

+	HCONTACT hUser;

 

-	if (ack->hContact == 0 || (hUser = (HANDLE)db_get_dw(ack->hContact, META_PROTO, "Handle",0)) == 0)

+	if (ack->hContact == 0 || (hUser = (HCONTACT)db_get_dw(ack->hContact, META_PROTO, "Handle",0)) == 0)

 		return 0;	// Can't find the MetaID, let through the protocol chain

 

 

@@ -524,11 +524,10 @@ int Meta_HandleACK(WPARAM wParam, LPARAM lParam)
 	// change the hContact in the avatar info struct, if it's the avatar we're using - else drop it

 	if (ack->type == ACKTYPE_AVATAR) {

 		if (ack->result == ACKRESULT_SUCCESS || ack->result == ACKRESULT_FAILED || ack->result == ACKRESULT_STATUS) {

-			HANDLE most_online;

 			DBVARIANT dbv;

 

 			// change avatar if the most online supporting avatars changes, or if we don't have one

-			most_online = Meta_GetMostOnlineSupporting(hUser, PFLAGNUM_4, PF4_AVATARS);

+			HCONTACT most_online = Meta_GetMostOnlineSupporting(hUser, PFLAGNUM_4, PF4_AVATARS);

 			//if (AI.hContact == 0 || AI.hContact != most_online) {

 			if (ack->hContact == 0 || ack->hContact != most_online) {

 				return 0;

@@ -572,7 +571,7 @@ int Meta_SettingChanged(WPARAM wParam, LPARAM lParam)
 	DBCONTACTWRITESETTING *dcws = (DBCONTACTWRITESETTING *)lParam;

 	char buffer[512], szId[40];

 	int contact_number;

-	HANDLE hMeta, most_online;

+	HCONTACT hMeta, most_online;

 

 	// hide metacontacts when groups disabled

 	if (wParam == 0

@@ -589,7 +588,7 @@ int Meta_SettingChanged(WPARAM wParam, LPARAM lParam)
 		// import process has just been run...call startup routines...

 		Meta_SetHandles();

 

-		for (HANDLE hContact = db_find_first(); hContact; hContact = db_find_next(hContact)) {

+		for (HCONTACT hContact = db_find_first(); hContact; hContact = db_find_next(hContact)) {

 			int meta_id;

 			if ((meta_id = db_get_dw(hContact, META_PROTO, META_ID,(DWORD)-1)) != (DWORD)-1)

 				Meta_CopyData(hContact);

@@ -602,22 +601,22 @@ int Meta_SettingChanged(WPARAM wParam, LPARAM lParam)
 	// from here on, we're just interested in contact settings

 	if (wParam == 0) return 0;

 

-	if ((hMeta=(HANDLE)db_get_dw((HANDLE)wParam, META_PROTO, "Handle",0))!=0 && CallService(MS_DB_CONTACT_IS, (WPARAM)hMeta, 0)) // just to be safe

+	if ((hMeta=(HCONTACT)db_get_dw((HCONTACT)wParam, META_PROTO, "Handle",0))!=0 && CallService(MS_DB_CONTACT_IS, (WPARAM)hMeta, 0)) // just to be safe

 	{

 		// This contact is attached to a MetaContact.

 

-		contact_number = Meta_GetContactNumber((HANDLE)wParam);

+		contact_number = Meta_GetContactNumber((HCONTACT)wParam);

 		if (contact_number == -1) return 0; // exit - db corruption

 

 		if ( !meta_group_hack_disabled && !strcmp(dcws->szModule, "CList") && !strcmp(dcws->szSetting, "Group") &&

-			Meta_IsEnabled() && db_get_b((HANDLE)wParam, META_PROTO, "Hidden", 0) == 0 && !Miranda_Terminated()) {

+			Meta_IsEnabled() && db_get_b((HCONTACT)wParam, META_PROTO, "Hidden", 0) == 0 && !Miranda_Terminated()) {

 				if ((dcws->value.type == DBVT_ASCIIZ || dcws->value.type == DBVT_UTF8) && !Meta_IsHiddenGroup(dcws->value.pszVal)) {

 					// subcontact group reassigned - copy to saved group

-					db_set((HANDLE)wParam, META_PROTO, "OldCListGroup", &dcws->value);

-					db_set_s((HANDLE)wParam, "CList", "Group", META_HIDDEN_GROUP);

+					db_set((HCONTACT)wParam, META_PROTO, "OldCListGroup", &dcws->value);

+					db_set_s((HCONTACT)wParam, "CList", "Group", META_HIDDEN_GROUP);

 				} else if (dcws->value.type == DBVT_DELETED) {

-					db_unset((HANDLE)wParam, META_PROTO, "OldCListGroup");

-					db_set_s((HANDLE)wParam, "CList", "Group", META_HIDDEN_GROUP);

+					db_unset((HCONTACT)wParam, META_PROTO, "OldCListGroup");

+					db_set_s((HCONTACT)wParam, "CList", "Group", META_HIDDEN_GROUP);

 				}

 		}

 		else if ( !strcmp(dcws->szSetting, "IP")) {

@@ -650,15 +649,13 @@ int Meta_SettingChanged(WPARAM wParam, LPARAM lParam)
 			}

 		}

 		else if ( !strcmp(dcws->szSetting, "Nick") && !dcws->value.type == DBVT_DELETED) {

-			HANDLE most_online;

-

 			// subcontact nick has changed - update metacontact

 			strcpy(buffer, "Nick");

 			strcat(buffer, _itoa(contact_number, szId, 10));

 			db_set(hMeta, META_PROTO, buffer, &dcws->value);

 

 			DBVARIANT dbv;

-			if (Mydb_get((HANDLE)wParam, "CList", "MyHandle", &dbv)) {

+			if (Mydb_get((HCONTACT)wParam, "CList", "MyHandle", &dbv)) {

 				strcpy(buffer, "CListName");

 				strcat(buffer, _itoa(contact_number, szId, 10));

 				db_set(hMeta, META_PROTO, buffer, &dcws->value);

@@ -666,7 +663,7 @@ int Meta_SettingChanged(WPARAM wParam, LPARAM lParam)
 			else db_free(&dbv);

 

 			// copy nick to metacontact, if it's the most online

-			most_online = Meta_GetMostOnline(hMeta);

+			HCONTACT most_online = Meta_GetMostOnline(hMeta);

 			Meta_CopyContactNick(hMeta, most_online);

 

 			return 0;

@@ -684,15 +681,13 @@ int Meta_SettingChanged(WPARAM wParam, LPARAM lParam)
 				db_set_dw(hMeta, META_PROTO, "LogonTS", 0);

 		}

 		else if ( !strcmp(dcws->szModule, "CList") && !strcmp(dcws->szSetting, "MyHandle")) {

-			HANDLE most_online;

-

 			if (dcws->value.type == DBVT_DELETED) {

-				char *proto = GetContactProto((HANDLE)wParam);

+				char *proto = GetContactProto((HCONTACT)wParam);

 				strcpy(buffer, "CListName");

 				strcat(buffer, _itoa(contact_number, szId, 10));

 

 				DBVARIANT dbv;

-				if (proto && !Mydb_get((HANDLE)wParam, proto, "Nick", &dbv)) {

+				if (proto && !Mydb_get((HCONTACT)wParam, proto, "Nick", &dbv)) {

 					db_set(hMeta, META_PROTO, buffer, &dbv);

 					db_free(&dbv);

 				} else {

@@ -707,7 +702,7 @@ int Meta_SettingChanged(WPARAM wParam, LPARAM lParam)
 			}

 

 			// copy nick to metacontact, if it's the most online

-			most_online = Meta_GetMostOnline(hMeta);

+			HCONTACT most_online = Meta_GetMostOnline(hMeta);

 			Meta_CopyContactNick(hMeta, most_online);

 

 			return 0;

@@ -757,11 +752,11 @@ int Meta_SettingChanged(WPARAM wParam, LPARAM lParam)
 			Meta_CopyData(hMeta);

 		}

 		else if ( !meta_group_hack_disabled && !strcmp(dcws->szModule, "CList") && !strcmp(dcws->szSetting, "Hidden")) {

-			if ((dcws->value.type == DBVT_DELETED || db_get_b((HANDLE)wParam, "CList", "Hidden", 0) == 0)

-				&& db_get_b((HANDLE)wParam, META_PROTO, "Hidden", 0) == 1)

+			if ((dcws->value.type == DBVT_DELETED || db_get_b((HCONTACT)wParam, "CList", "Hidden", 0) == 0)

+				&& db_get_b((HCONTACT)wParam, META_PROTO, "Hidden", 0) == 1)

 			{

 				// a subcontact we hid (e.g. jabber) has been unhidden - hide it again :(

-				db_set_b((HANDLE)wParam, "CList", "Hidden", 1);

+				db_set_b((HCONTACT)wParam, "CList", "Hidden", 1);

 			}

 		}

 	}

@@ -772,21 +767,21 @@ int Meta_SettingChanged(WPARAM wParam, LPARAM lParam)
 int Meta_ContactDeleted(WPARAM wParam, LPARAM lParam)

 {

 	// is a subcontact - update meta contact

-	HANDLE hMeta = (HANDLE)db_get_dw((HANDLE)wParam, META_PROTO, "Handle", 0);

+	HCONTACT hMeta = (HCONTACT)db_get_dw((HCONTACT)wParam, META_PROTO, "Handle", 0);

 	if (hMeta) {

-		Meta_RemoveContactNumber(hMeta, db_get_dw((HANDLE)wParam, META_PROTO, "ContactNumber", -1));

+		Meta_RemoveContactNumber(hMeta, db_get_dw((HCONTACT)wParam, META_PROTO, "ContactNumber", -1));

 		NotifyEventHooks(hSubcontactsChanged, (WPARAM)hMeta, 0);

 		return 0;

 	}

 

 	// not a subcontact - is it a metacontact?

-	int num_contacts = db_get_dw((HANDLE)wParam, META_PROTO, "NumContacts", 0);

+	int num_contacts = db_get_dw((HCONTACT)wParam, META_PROTO, "NumContacts", 0);

 	if (num_contacts)

 		NotifyEventHooks(hSubcontactsChanged, (WPARAM)wParam, 0);

 

 	// remove & restore all subcontacts

 	for (int i = 0; i < num_contacts; i++) {

-		HANDLE hContact = Meta_GetContactHandle((HANDLE)wParam, i);

+		HCONTACT hContact = Meta_GetContactHandle((HCONTACT)wParam, i);

 		if (hContact && (HANDLE)db_get_dw(hContact, META_PROTO, "Handle", 0) == (HANDLE)wParam) {

 			if (db_get_b(hContact, META_PROTO, "IsSubcontact", 0) == 1)

 				db_unset(hContact, META_PROTO, "IsSubcontact");

@@ -812,13 +807,13 @@ int Meta_ContactDeleted(WPARAM wParam, LPARAM lParam)
 INT_PTR Meta_UserIsTyping(WPARAM wParam, LPARAM lParam)

 {

 	// This is a simple contact, let through the stack of protocols

-	if (db_get_dw((HANDLE)wParam, META_PROTO, META_ID,(DWORD)-1) == (DWORD)-1)

+	if (db_get_dw((HCONTACT)wParam, META_PROTO, META_ID,(DWORD)-1) == (DWORD)-1)

 		return 0;

 

 	// forward to sending protocol, if supported

 

-	HANDLE most_online = Meta_GetMostOnline((HANDLE)wParam);

-	Meta_CopyContactNick((HANDLE)wParam, most_online);

+	HCONTACT most_online = Meta_GetMostOnline((HCONTACT)wParam);

+	Meta_CopyContactNick((HCONTACT)wParam, most_online);

 	if ( !most_online)

 		return 0;

 

@@ -837,8 +832,8 @@ INT_PTR Meta_UserIsTyping(WPARAM wParam, LPARAM lParam)
 */

 int Meta_ContactIsTyping(WPARAM wParam, LPARAM lParam)

 {

-	HANDLE hMeta;

-	if ((hMeta = (HANDLE)db_get_dw((HANDLE)wParam, META_PROTO, "Handle",0)) != 0 && Meta_IsEnabled()) {

+	HCONTACT hMeta;

+	if ((hMeta = (HCONTACT)db_get_dw((HCONTACT)wParam, META_PROTO, "Handle",0)) != 0 && Meta_IsEnabled()) {

 		// This contact is attached to a MetaContact.

 		if ( !options.subcontact_windows) { // we don't want clicking on the clist notification icon to open the metacontact message window

 			// try to remove any clist events we added for subcontact

@@ -860,12 +855,12 @@ int Meta_ContactIsTyping(WPARAM wParam, LPARAM lParam)
 

 int Meta_UserInfo(WPARAM wParam, LPARAM lParam)

 {

-	DWORD default_contact_number = db_get_dw((HANDLE)lParam, META_PROTO, "Default", (DWORD)-1);

+	DWORD default_contact_number = db_get_dw((HCONTACT)lParam, META_PROTO, "Default", (DWORD)-1);

 

 	if (default_contact_number == -1) // not a meta contact

 		return 0;

 

-	CallService(MS_USERINFO_SHOWDIALOG, (WPARAM)Meta_GetContactHandle((HANDLE)lParam, default_contact_number), 0);

+	CallService(MS_USERINFO_SHOWDIALOG, (WPARAM)Meta_GetContactHandle((HCONTACT)lParam, default_contact_number), 0);

 	return 1;

 }

 

@@ -873,11 +868,11 @@ int Meta_UserInfo(WPARAM wParam, LPARAM lParam)
 // let received messages through and add db history to metacontact, or vice versa

 int Meta_MessageWindowEvent(WPARAM wParam, LPARAM lParam) {

 	MessageWindowEventData *mwed = (MessageWindowEventData *)lParam;

-	HANDLE hMeta = 0;

+	HCONTACT hMeta = 0;

 

 	message_window_api_enabled = TRUE;

 

-	if ((hMeta = (HANDLE)db_get_dw(mwed->hContact, META_PROTO, "Handle", 0)) != 0

+	if ((hMeta = (HCONTACT)db_get_dw(mwed->hContact, META_PROTO, "Handle", 0)) != 0

 		|| db_get_dw(mwed->hContact, META_PROTO, META_ID, (DWORD)-1) != (DWORD)-1)

 	{

 		// contact is subcontact of metacontact, or an actual metacontact - record whether window is open or closed

@@ -912,11 +907,11 @@ int Meta_MessageWindowEvent(WPARAM wParam, LPARAM lParam) {
 

 int Meta_ClistDoubleClicked(WPARAM wParam, LPARAM lParam)

 {

-	if (db_get_dw((HANDLE)wParam, META_PROTO, "Default",(WORD)-1) == (WORD)-1)

+	if (db_get_dw((HCONTACT)wParam, META_PROTO, "Default",(WORD)-1) == (WORD)-1)

 		return 0;

 

 	// -1 indicates  no specific capability but respect 'ForceDefault'

-	HANDLE most_online = Meta_GetMostOnlineSupporting((HANDLE)wParam, PFLAGNUM_1, -1);

+	HCONTACT most_online = Meta_GetMostOnlineSupporting((HCONTACT)wParam, PFLAGNUM_1, -1);

 	if ( !most_online)

 		return 0;

 

@@ -949,7 +944,7 @@ int Meta_ClistDoubleClicked(WPARAM wParam, LPARAM lParam)
 

 INT_PTR Meta_ClistMessageEventClicked(WPARAM wParam, LPARAM lParam)

 {

-	HANDLE hContact = ((CLISTEVENT *)lParam)->hContact;

+	HCONTACT hContact = ((CLISTEVENT *)lParam)->hContact;

 	return Meta_ClistDoubleClicked((WPARAM)hContact, (LPARAM)((CLISTEVENT *)lParam)->hDbEvent);

 }

 

@@ -1046,7 +1041,7 @@ int Meta_ModulesLoaded(WPARAM wParam, LPARAM lParam)
 	// loop and copy data from subcontacts

 	if (options.copydata) {

 		int meta_id;

-		for (HANDLE hContact = db_find_first(); hContact; hContact = db_find_next(hContact))

+		for (HCONTACT hContact = db_find_first(); hContact; hContact = db_find_next(hContact))

 			if ((meta_id = db_get_dw(hContact, META_PROTO, META_ID,(DWORD)-1))!=(DWORD)-1)

 				Meta_CopyData(hContact);

 	}

@@ -1098,7 +1093,7 @@ static VOID CALLBACK sttMenuThread( PVOID param )
 

 INT_PTR Meta_ContactMenuFunc(WPARAM wParam, LPARAM lParam)

 {

-	HANDLE hContact = Meta_GetContactHandle((HANDLE)wParam, (int)lParam);

+	HCONTACT hContact = Meta_GetContactHandle((HCONTACT)wParam, (int)lParam);

 

 	if (options.menu_function == FT_MSG) {

 		// open message window if protocol supports message sending or chat, else simulate double click

@@ -1117,7 +1112,7 @@ INT_PTR Meta_ContactMenuFunc(WPARAM wParam, LPARAM lParam)
 

 			if ((caps & PF1_IMSEND) || (caps & PF1_CHAT) || (proto && strcmp(proto, "IRC") == 0)) {

 				// set default contact for sending/status and open message window

-				db_set_dw((HANDLE)wParam, META_PROTO, "Default", (DWORD)(int)lParam);

+				db_set_dw((HCONTACT)wParam, META_PROTO, "Default", (DWORD)(int)lParam);

 				NotifyEventHooks(hEventDefaultChanged, wParam, (LPARAM)hContact);

 				CallService(MS_MSG_SENDMESSAGE, wParam, 0);

 			} else

@@ -1157,12 +1152,7 @@ INT_PTR Meta_FileSend(WPARAM wParam, LPARAM lParam)
 	}

 	else

 	{

-		HANDLE most_online;

-		//DBEVENTINFO dbei;

-		//char szServiceName[100];

-

-		most_online = Meta_GetMostOnlineSupporting(ccs->hContact, PFLAGNUM_1, PF1_FILESEND);

-

+		HCONTACT most_online = Meta_GetMostOnlineSupporting(ccs->hContact, PFLAGNUM_1, PF1_FILESEND);

 		if ( !most_online) {

 			//PUShowMessage("no most online for ft", SM_NOTIFY);

 			return 0;

@@ -1189,10 +1179,7 @@ INT_PTR Meta_GetAwayMsg(WPARAM wParam, LPARAM lParam)
 	}

 	else

 	{

-		HANDLE most_online;

-

-		most_online = Meta_GetMostOnlineSupporting(ccs->hContact, PFLAGNUM_1, PF1_MODEMSGRECV);

-

+		HCONTACT most_online = Meta_GetMostOnlineSupporting(ccs->hContact, PFLAGNUM_1, PF1_MODEMSGRECV);

 		if ( !most_online)

 			return 0;

 

@@ -1221,8 +1208,8 @@ INT_PTR Meta_GetAvatarInfo(WPARAM wParam, LPARAM lParam) {
 	}

 	else

 	{

-		HANDLE hMeta = AI->hContact;

-		HANDLE hSub = Meta_GetMostOnlineSupporting(AI->hContact, PFLAGNUM_4, PF4_AVATARS);

+		HCONTACT hMeta = AI->hContact;

+		HCONTACT hSub = Meta_GetMostOnlineSupporting(AI->hContact, PFLAGNUM_4, PF4_AVATARS);

 		if ( !hSub)

 			return GAIR_NOAVATAR;

 

@@ -1249,7 +1236,7 @@ INT_PTR Meta_GetInfo(WPARAM wParam, LPARAM lParam)
 	if ((default_contact_number = db_get_dw(ccs->hContact, META_PROTO, "Default",(DWORD)-1)) == (DWORD)-1)

 		return 0;

 

-	HANDLE most_online = Meta_GetMostOnlineSupporting(ccs->hContact, PFLAGNUM_4, PF4_AVATARS);

+	HCONTACT most_online = Meta_GetMostOnlineSupporting(ccs->hContact, PFLAGNUM_4, PF4_AVATARS);

 	if ( !most_online)

 		return 0;

 

@@ -1305,16 +1292,16 @@ int Meta_OptInit(WPARAM wParam, LPARAM lParam)
 

 int Meta_CallMostOnline(WPARAM wParam, LPARAM lParam)

 {

-	HANDLE most_online_im = Meta_GetMostOnline((HANDLE)wParam);

+	HCONTACT most_online_im = Meta_GetMostOnline((HCONTACT)wParam);

 

 	// fix nick

-	Meta_CopyContactNick((HANDLE)wParam, most_online_im);

+	Meta_CopyContactNick((HCONTACT)wParam, most_online_im);

 

 	// fix status

-	Meta_FixStatus((HANDLE)wParam);

+	Meta_FixStatus((HCONTACT)wParam);

 

 	// copy all other data

-	Meta_CopyData((HANDLE) wParam);

+	Meta_CopyData((HCONTACT) wParam);

 	return 0;

 }