- 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, 5 insertions, 5 deletions

diff --git a/plugins/AVS/src/main.cpp b/plugins/AVS/src/main.cpp
index 591ac7a693..a4422d83b4 100644
--- a/plugins/AVS/src/main.cpp
+++ b/plugins/AVS/src/main.cpp
@@ -134,8 +134,8 @@ static int MetaChanged(WPARAM wParam, LPARAM lParam)
 

 	AVATARCACHEENTRY *ace;

 

-	HANDLE hContact = (HANDLE) wParam;

-	HANDLE hSubContact = GetContactThatHaveTheAvatar(hContact);

+	HCONTACT hContact = (HCONTACT)wParam;

+	HCONTACT hSubContact = GetContactThatHaveTheAvatar(hContact);

 

 	// Get the node

 	CacheNode *node = FindAvatarInCache(hSubContact, TRUE);

@@ -190,7 +190,7 @@ static void LoadAccountInfo(PROTOACCOUNT *acc)
 	g_ProtoPictures.insert(pce);

 

 	pce = new protoPicCacheEntry;

-	CreateAvatarInCache((HANDLE)-1, pce, acc->szModuleName);

+	CreateAvatarInCache((HCONTACT)-1, pce, acc->szModuleName);

 	pce->szProtoname = mir_strdup(acc->szModuleName);

 	pce->tszAccName = mir_tstrdup(acc->tszAccountName);

 	g_MyAvatars.insert(pce);

@@ -242,7 +242,7 @@ static int ContactSettingChanged(WPARAM wParam, LPARAM lParam)
 

 static int ContactDeleted(WPARAM wParam, LPARAM lParam)

 {

-	DeleteAvatarFromCache((HANDLE)wParam, TRUE);

+	DeleteAvatarFromCache((HCONTACT)wParam, TRUE);

 	return 0;

 }

 

@@ -401,7 +401,7 @@ static int ModulesLoaded(WPARAM wParam, LPARAM lParam)
 

 	// Load global avatar

 	protoPicCacheEntry *pce = new protoPicCacheEntry;

-	CreateAvatarInCache((HANDLE)-1, pce, "");

+	CreateAvatarInCache((HCONTACT)-1, pce, "");

 	pce->szProtoname = mir_strdup("");

 	g_MyAvatars.insert(pce);