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

diff --git a/protocols/IcqOscarJ/src/fam_03buddy.cpp b/protocols/IcqOscarJ/src/fam_03buddy.cpp
index 94f5e1c930..d443919e6c 100644
--- a/protocols/IcqOscarJ/src/fam_03buddy.cpp
+++ b/protocols/IcqOscarJ/src/fam_03buddy.cpp
@@ -196,7 +196,7 @@ void CIcqProto::handleUserOnline(BYTE *buf, WORD wLen, serverthread_info *info)
 	wLen -= 2;

 

 	// Ignore status notification if the user is not already on our list

-	HANDLE hContact = HContactFromUID(dwUIN, szUID, NULL);

+	HCONTACT hContact = HContactFromUID(dwUIN, szUID, NULL);

 	if (hContact == INVALID_HANDLE_VALUE)

 	{

 #ifdef _DEBUG

@@ -618,7 +618,7 @@ void CIcqProto::handleUserOffline(BYTE *buf, WORD wLen)
 		}

 

 		// Determine contact

-		HANDLE hContact = HContactFromUID(dwUIN, szUID, NULL);

+		HCONTACT hContact = HContactFromUID(dwUIN, szUID, NULL);

 

 		// Skip contacts that are not already on our list or are already offline

 		if (hContact != INVALID_HANDLE_VALUE)

@@ -666,7 +666,7 @@ void CIcqProto::handleUserOffline(BYTE *buf, WORD wLen)
 }

 

 

-void CIcqProto::parseStatusNote(DWORD dwUin, char *szUid, HANDLE hContact, oscar_tlv_chain *pChain)

+void CIcqProto::parseStatusNote(DWORD dwUin, char *szUid, HCONTACT hContact, oscar_tlv_chain *pChain)

 {

 	DWORD dwStatusNoteTS = time(NULL);

 	BYTE *pStatusNoteTS, *pStatusNote;