From 862116c0d40a7304c458f68c4c725e8a95960588 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Mon, 24 Feb 2014 13:18:53 +0000
Subject: valid first parameter's name of ME_DB_CONTACT_SETTINGCHANGED handlers

git-svn-id: http://svn.miranda-ng.org/main/trunk@8255 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 protocols/IcqOscarJ/src/icq_servlist.cpp | 27 +++++++++------------------
 protocols/Yahoo/src/util.cpp             | 10 +++++-----
 2 files changed, 14 insertions(+), 23 deletions(-)

(limited to 'protocols')

diff --git a/protocols/IcqOscarJ/src/icq_servlist.cpp b/protocols/IcqOscarJ/src/icq_servlist.cpp
index dac87bdf52..8b7e3aa0cb 100644
--- a/protocols/IcqOscarJ/src/icq_servlist.cpp
+++ b/protocols/IcqOscarJ/src/icq_servlist.cpp
@@ -2572,7 +2572,7 @@ void CIcqProto::resetServContactAuthState(MCONTACT hContact, DWORD dwUin)
 *
 */
 
-int CIcqProto::ServListDbSettingChanged(WPARAM wParam, LPARAM lParam)
+int CIcqProto::ServListDbSettingChanged(WPARAM hContact, LPARAM lParam)
 {
 	DBCONTACTWRITESETTING* cws = (DBCONTACTWRITESETTING*)lParam;
 
@@ -2590,28 +2590,19 @@ int CIcqProto::ServListDbSettingChanged(WPARAM wParam, LPARAM lParam)
 	if (!strcmpnull(cws->szModule, "CList"))
 	{
 		// Has contact been renamed?
-		if (!strcmpnull(cws->szSetting, "MyHandle") &&
-			getByte("StoreServerDetails", DEFAULT_SS_STORE))
-		{ // Update contact's details in server-list
-			servlistUpdateContact(wParam);
-		}
+		if (!strcmpnull(cws->szSetting, "MyHandle") && getByte("StoreServerDetails", DEFAULT_SS_STORE))
+			servlistUpdateContact(hContact); // Update contact's details in server-list
 
 		// Has contact been moved to another group?
-		if (!strcmpnull(cws->szSetting, "Group") &&
-			getByte("StoreServerDetails", DEFAULT_SS_STORE))
-		{ // Read group from DB
-			char* szNewGroup = getContactCListGroup(wParam);
-
+		if (!strcmpnull(cws->szSetting, "Group") && getByte("StoreServerDetails", DEFAULT_SS_STORE)) {
+			char* szNewGroup = getContactCListGroup(hContact); // Read group from DB
 			SAFE_FREE(&szNewGroup);
 		}
 	}
-	else if (!strcmpnull(cws->szModule, "UserInfo"))
-	{
-		if (!strcmpnull(cws->szSetting, "MyNotes") &&
-			getByte("StoreServerDetails", DEFAULT_SS_STORE))
-		{ // Update contact's details in server-list
-			servlistUpdateContact(wParam);
-		}
+	else if (!strcmpnull(cws->szModule, "UserInfo")) {
+		// Update contact's details in server-list
+		if (!strcmpnull(cws->szSetting, "MyNotes") && getByte("StoreServerDetails", DEFAULT_SS_STORE))
+			servlistUpdateContact(hContact);
 	}
 
 	return 0;
diff --git a/protocols/Yahoo/src/util.cpp b/protocols/Yahoo/src/util.cpp
index 8e9aca7833..e806efb274 100644
--- a/protocols/Yahoo/src/util.cpp
+++ b/protocols/Yahoo/src/util.cpp
@@ -152,18 +152,18 @@ void CYahooProto::ShowError(const TCHAR *title, const TCHAR *buff)
 			ShowNotification(title, buff, NIIF_ERROR);
 }
 
-int __cdecl CYahooProto::OnSettingChanged(WPARAM wParam, LPARAM lParam)
+int __cdecl CYahooProto::OnSettingChanged(WPARAM hContact, LPARAM lParam)
 {
-	if (!wParam || !m_bLoggedIn)
+	if (!hContact || !m_bLoggedIn)
 		return 0;
 
-	DBCONTACTWRITESETTING *cws = (DBCONTACTWRITESETTING*) lParam;
+	DBCONTACTWRITESETTING *cws = (DBCONTACTWRITESETTING*)lParam;
 	if ( !strcmp(cws->szSetting, "ApparentMode")) {
 		debugLogA("DB Setting changed.  YAHOO user's visible setting changed.");
 
 		DBVARIANT dbv;
-		if (!getString(wParam, YAHOO_LOGINID, &dbv)) {
-			int iAdd = (ID_STATUS_OFFLINE == getWord(wParam, "ApparentMode", 0));
+		if (!getString(hContact, YAHOO_LOGINID, &dbv)) {
+			int iAdd = (ID_STATUS_OFFLINE == getWord(hContact, "ApparentMode", 0));
 			stealth(dbv.pszVal, iAdd);
 			db_free(&dbv);
 		}
-- 
cgit v1.2.3