- 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/plugins/MobileState/src/main.cpp b/plugins/MobileState/src/main.cpp
index 17de9672af..745622593a 100644
--- a/plugins/MobileState/src/main.cpp
+++ b/plugins/MobileState/src/main.cpp
@@ -50,7 +50,7 @@ extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD miranda
 	return &pluginInfo;

 }

 

-bool hasMobileClient(HANDLE hContact, LPARAM lParam)

+bool hasMobileClient(HCONTACT hContact, LPARAM lParam)

 {

 	char *proto = GetContactProto(hContact);

 

@@ -71,10 +71,10 @@ int ExtraIconsApply(WPARAM wParam, LPARAM lParam)
 	if (wParam == NULL)

 		return 0;

 

-	if (hasMobileClient((HANDLE)wParam, lParam))

-		ExtraIcon_SetIcon(hExtraIcon, (HANDLE)wParam, "mobile_icon");

+	if (hasMobileClient((HCONTACT)wParam, lParam))

+		ExtraIcon_SetIcon(hExtraIcon, (HCONTACT)wParam, "mobile_icon");

 	else

-		ExtraIcon_Clear(hExtraIcon, (HANDLE)wParam);

+		ExtraIcon_Clear(hExtraIcon, (HCONTACT)wParam);

 

 	return 0;

 }

@@ -82,7 +82,7 @@ int ExtraIconsApply(WPARAM wParam, LPARAM lParam)
 int onContactSettingChanged(WPARAM wParam,LPARAM lParam)

 {

 	DBCONTACTWRITESETTING *cws=(DBCONTACTWRITESETTING*)lParam;

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

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

 	if (!proto)

 		return 0;

 

@@ -102,7 +102,7 @@ int onModulesLoaded(WPARAM wParam,LPARAM lParam)
 	hExtraIcon = ExtraIcon_Register("mobilestate", LPGEN("Mobile State"), "mobile_icon");

 

 	// Set initial value for all contacts

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

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

 		ExtraIconsApply((WPARAM)hContact, 1);

 

 	return 0;