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

diff --git a/include/m_extraicons.h b/include/m_extraicons.h
index f6feb26397..e67eec4905 100644
--- a/include/m_extraicons.h
+++ b/include/m_extraicons.h
@@ -95,14 +95,14 @@ typedef struct {
 	MIRANDAHOOK RebuildIcons;

 

 	// Callback to set the icon to clist, calling MS_CLIST_EXTRA_SET_ICON or MS_EXTRAICON_SET_ICON

-	// wParam = HANDLE hContact

+	// wParam = HCONTACT hContact

 	// lParam = 0

 	MIRANDAHOOK ApplyIcon;

 

 	// Other optional callbacks

 

 	// [Optional] Callback called when extra icon was clicked

-	// wParam = HANDLE hContact

+	// wParam = HCONTACT hContact

 	// lParam = int slot

 	// param = onClickParam

 	MIRANDAHOOKPARAM OnClick;

@@ -122,7 +122,7 @@ typedef struct {
 typedef struct {

 	int cbSize;

 	HANDLE hExtraIcon;      // Value returned by MS_EXTRAICON_REGISTER

-	HANDLE hContact;        // Contact to set the extra icon

+	HCONTACT hContact;        // Contact to set the extra icon

 	union {                 // The icon to be set. This depends on the type of the extra icon:

 		HANDLE hImage;       // Value returned by MS_CLIST_EXTRA_ADD_ICON (if EXTRAICON_TYPE_CALLBACK)

 		                     // or the icolib icon handle (if EXTRAICON_TYPE_ICOLIB)

@@ -185,7 +185,7 @@ static HANDLE ExtraIcon_Register(
 	return (HANDLE) CallService(MS_EXTRAICON_REGISTER, (WPARAM) &ei, hLangpack);

 }

 

-static int ExtraIcon_SetIcon(HANDLE hExtraIcon, HANDLE hContact, HANDLE hImage)

+static int ExtraIcon_SetIcon(HANDLE hExtraIcon, HCONTACT hContact, HANDLE hImage)

 {

 	EXTRAICON ei = { sizeof(ei) };

 	ei.hExtraIcon = hExtraIcon;

@@ -195,7 +195,7 @@ static int ExtraIcon_SetIcon(HANDLE hExtraIcon, HANDLE hContact, HANDLE hImage)
 	return CallService(MS_EXTRAICON_SET_ICON, (WPARAM) &ei, 0);

 }

 

-static int ExtraIcon_SetIcon(HANDLE hExtraIcon, HANDLE hContact, const char *icoName)

+static int ExtraIcon_SetIcon(HANDLE hExtraIcon, HCONTACT hContact, const char *icoName)

 {

 	EXTRAICON ei = { sizeof(ei) };

 	ei.hExtraIcon = hExtraIcon;

@@ -205,7 +205,7 @@ static int ExtraIcon_SetIcon(HANDLE hExtraIcon, HANDLE hContact, const char *ico
 	return CallService(MS_EXTRAICON_SET_ICON_BY_NAME, (WPARAM) &ei, 0);

 }

 

-static int ExtraIcon_Clear(HANDLE hExtraIcon, HANDLE hContact)

+static int ExtraIcon_Clear(HANDLE hExtraIcon, HCONTACT hContact)

 {

 	EXTRAICON ei = { sizeof(ei) };

 	ei.hExtraIcon = hExtraIcon;