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

diff --git a/plugins/YahooGroups/src/services.cpp b/plugins/YahooGroups/src/services.cpp
index e5c1175db4..104ce5a949 100644
--- a/plugins/YahooGroups/src/services.cpp
+++ b/plugins/YahooGroups/src/services.cpp
@@ -106,7 +106,7 @@ void AddNewGroup(char *newGroup)
 	availableGroups.Add(_strdup(group + 1));

 }

 

-void AddContactToGroup(HANDLE hContact, char *group)

+void AddContactToGroup(HCONTACT hContact, char *group)

 {

 	const int MAX_SIZE = 1024;

 	wchar_t wide[MAX_SIZE] = {0};

@@ -159,13 +159,13 @@ void CreateGroup(char *group)
 	}

 }

 

-void ProcessContacts(void (*callback)(HANDLE, char *), char *protocol)

+void ProcessContacts(void (*callback)(HCONTACT, char *), char *protocol)

 {

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

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

 		callback(hContact, protocol);

 }

 

-void YahooMoveCallback(HANDLE hContact, char *unused)

+void YahooMoveCallback(HCONTACT hContact, char *unused)

 {

 	char protocol[128] = {0};

 	GetContactProtocol(hContact, protocol, sizeof(protocol));

@@ -182,7 +182,7 @@ void YahooMoveCallback(HANDLE hContact, char *unused)
 	}

 }

 

-void ResetGroupCallback(HANDLE hContact, char *protocol)

+void ResetGroupCallback(HCONTACT hContact, char *protocol)

 {

 	char p[128] = {0};

 	

@@ -197,13 +197,11 @@ void ResetGroupCallback(HANDLE hContact, char *protocol)
 INT_PTR YahooGroupsMoveService(WPARAM wParam, LPARAM lParam)

 {

 	ProcessContacts(YahooMoveCallback, NULL);

-

 	return 0;

 }

 

 INT_PTR YahooGroupsResetService(WPARAM wParam, LPARAM lParam)

 {

 	ProcessContacts(ResetGroupCallback, NULL);

-

 	return 0;

 }