From ddba4ede6b451d0cfcd0d32b5180fbd0689966bf Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Mon, 10 Feb 2014 08:04:30 +0000
Subject: - 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
---
 protocols/Tlen/src/tlen_avatar.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'protocols/Tlen/src/tlen_avatar.cpp')

diff --git a/protocols/Tlen/src/tlen_avatar.cpp b/protocols/Tlen/src/tlen_avatar.cpp
index aea83f9804..f413b277ec 100644
--- a/protocols/Tlen/src/tlen_avatar.cpp
+++ b/protocols/Tlen/src/tlen_avatar.cpp
@@ -64,7 +64,7 @@ void TlenGetAvatarFileName(TlenProtocol *proto, TLEN_LIST_ITEM *item, TCHAR* pts
 		mir_sntprintf(ptszDest + tPathLen, MAX_PATH - tPathLen, TEXT("%S_avatar%s"), proto->m_szModuleName, tszFileType);
 }
 
-static void RemoveAvatar(TlenProtocol *proto, HANDLE hContact) {
+static void RemoveAvatar(TlenProtocol *proto, HCONTACT hContact) {
 	TCHAR tFileName[ MAX_PATH ];
 	if (hContact == NULL) {
 		proto->threadData->avatarHash[0] = '\0';
@@ -77,7 +77,7 @@ static void RemoveAvatar(TlenProtocol *proto, HANDLE hContact) {
 	ProtoBroadcastAck(proto->m_szModuleName, NULL, ACKTYPE_AVATAR, ACKRESULT_STATUS, NULL, 0);
 }
 
-static void SetAvatar(TlenProtocol *proto, HANDLE hContact, TLEN_LIST_ITEM *item, char *data, int len, DWORD format) {
+static void SetAvatar(TlenProtocol *proto, HCONTACT hContact, TLEN_LIST_ITEM *item, char *data, int len, DWORD format) {
 	TCHAR filename[MAX_PATH];
 	char md5[33];
 	mir_md5_state_t ctx;
@@ -123,7 +123,7 @@ int TlenProcessAvatarNode(TlenProtocol *proto, XmlNode *avatarNode, TLEN_LIST_IT
 	XmlNode *aNode;
 	char *oldHash = NULL;
 	char *md5 = NULL, *type = NULL;
-	HANDLE hContact;
+	HCONTACT hContact;
 	hContact = NULL;
 	if (item != NULL) {
 		if ((hContact=TlenHContactFromJID(proto, item->jid)) == NULL) return 0;
@@ -165,7 +165,7 @@ int TlenProcessAvatarNode(TlenProtocol *proto, XmlNode *avatarNode, TLEN_LIST_IT
 }
 
 void TlenProcessPresenceAvatar(TlenProtocol *proto, XmlNode *node, TLEN_LIST_ITEM *item) {
-	HANDLE hContact;
+	HCONTACT hContact;
 	if ((hContact=TlenHContactFromJID(proto, item->jid)) == NULL) return;
 	TlenProcessAvatarNode(proto, TlenXmlGetChild(node, "avatar"), item);
 }
@@ -225,7 +225,7 @@ static int getAvatarMutex = 0;
 
 typedef struct {
 	TlenProtocol *proto;
-	HANDLE hContact;
+	HCONTACT hContact;
 } TLENGETAVATARTHREADDATA;
 
 static void TlenGetAvatarThread(void *ptr) {
@@ -234,7 +234,7 @@ static void TlenGetAvatarThread(void *ptr) {
 	NETLIBHTTPREQUEST req;
 	NETLIBHTTPREQUEST *resp;
 	TLENGETAVATARTHREADDATA *data = (TLENGETAVATARTHREADDATA *)ptr;
-	HANDLE hContact = data->hContact;
+	HCONTACT hContact = data->hContact;
 	char *request;
 	char *login = NULL;
 	if (hContact != NULL) {
@@ -301,7 +301,7 @@ static void TlenGetAvatarThread(void *ptr) {
 	mir_free(data);
 }
 
-void TlenGetAvatar(TlenProtocol *proto, HANDLE hContact) {
+void TlenGetAvatar(TlenProtocol *proto, HCONTACT hContact) {
 	if (hContact == NULL) {
 		if (getAvatarMutex != 0) {
 			return;
-- 
cgit v1.2.3