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
---
 plugins/TabSRMM/src/globals.cpp | 33 ++++++++++++++++-----------------
 1 file changed, 16 insertions(+), 17 deletions(-)

(limited to 'plugins/TabSRMM/src')

diff --git a/plugins/TabSRMM/src/globals.cpp b/plugins/TabSRMM/src/globals.cpp
index 1422425ce2..1136cdab6a 100644
--- a/plugins/TabSRMM/src/globals.cpp
+++ b/plugins/TabSRMM/src/globals.cpp
@@ -393,20 +393,19 @@ int CGlobals::ModulesLoaded(WPARAM wParam, LPARAM lParam)
 // needed to catch status, nickname and other changes in order to update open message
 // sessions.
 
-int CGlobals::DBSettingChanged(WPARAM wParam, LPARAM lParam)
+int CGlobals::DBSettingChanged(WPARAM hContact, LPARAM lParam)
 {
 	DBCONTACTWRITESETTING *cws = (DBCONTACTWRITESETTING *) lParam;
 	const char 	*szProto = NULL;
 	const char  *setting = cws->szSetting;
-	HWND		hwnd = 0;
 	CContactCache* c = 0;
-	bool		fChanged = false, fNickChanged = false, fExtendedStatusChange = false;
+	bool fChanged = false, fNickChanged = false, fExtendedStatusChange = false;
 
-	hwnd = M.FindWindow(wParam);
+	HWND hwnd = M.FindWindow(hContact);
 
-	if (hwnd == 0 && wParam != 0) {     // we are not interested in this event if there is no open message window/tab
+	if (hwnd == 0 && hContact != 0) {     // we are not interested in this event if there is no open message window/tab
 		if (!strcmp(setting, "Status") || !strcmp(setting, "MyHandle") || !strcmp(setting, "Nick") || !strcmp(cws->szModule, SRMSGMOD_T)) {
-			c = CContactCache::getContactCache(wParam);
+			c = CContactCache::getContactCache(hContact);
 			if (c) {
 				fChanged = c->updateStatus();
 				if (strcmp(setting, "Status"))
@@ -418,13 +417,13 @@ int CGlobals::DBSettingChanged(WPARAM wParam, LPARAM lParam)
 		return 0;
 	}
 
-	if (wParam == 0 && !strcmp("Nick", setting)) {
+	if (hContact == 0 && !strcmp("Nick", setting)) {
 		M.BroadcastMessage(DM_OWNNICKCHANGED, 0, (LPARAM)cws->szModule);
 		return 0;
 	}
 
-	if (wParam) {
-		c = CContactCache::getContactCache(wParam);
+	if (hContact) {
+		c = CContactCache::getContactCache(hContact);
 		if (c) {
 			szProto = c->getProto();
 			if (!strcmp(cws->szModule, SRMSGMOD_T)) {					// catch own relevant settings
@@ -434,7 +433,7 @@ int CGlobals::DBSettingChanged(WPARAM wParam, LPARAM lParam)
 		}
 	}
 
-	if (wParam == 0 && !lstrcmpA(setting, "Enabled")) {
+	if (hContact == 0 && !lstrcmpA(setting, "Enabled")) {
 		if (PluginConfig.g_MetaContactsAvail && !lstrcmpA(cws->szModule, PluginConfig.szMetaName)) { 		// catch the disabled meta contacts
 			PluginConfig.bMetaEnabled = abs(M.GetByte(PluginConfig.szMetaName, "Enabled", -1));
 			CContactCache::cacheUpdateMetaChanged();
@@ -445,7 +444,7 @@ int CGlobals::DBSettingChanged(WPARAM wParam, LPARAM lParam)
 		return 0;
 
 	if (PluginConfig.g_MetaContactsAvail && !lstrcmpA(cws->szModule, PluginConfig.szMetaName))
-		if (wParam != 0 && !lstrcmpA(setting, "Nick"))      // filter out this setting to avoid infinite loops while trying to obtain the most online contact
+		if (hContact != 0 && !lstrcmpA(setting, "Nick"))      // filter out this setting to avoid infinite loops while trying to obtain the most online contact
 			return 0;
 
 	if (hwnd) {
@@ -497,10 +496,10 @@ int CGlobals::DBSettingChanged(WPARAM wParam, LPARAM lParam)
 /////////////////////////////////////////////////////////////////////////////////////////
 // event fired when a contact has been deleted. Make sure to close its message session
 
-int CGlobals::DBContactDeleted(WPARAM wParam, LPARAM lParam)
+int CGlobals::DBContactDeleted(WPARAM hContact, LPARAM lParam)
 {
-	if (wParam) {
-		CContactCache *c = CContactCache::getContactCache(wParam);
+	if (hContact) {
+		CContactCache *c = CContactCache::getContactCache(hContact);
 		if (c)
 			c->deletedHandler();
 	}
@@ -512,10 +511,10 @@ int CGlobals::DBContactDeleted(WPARAM wParam, LPARAM lParam)
 // our contact cache and, if a message window exists, tell it to update
 // relevant information.
 
-int CGlobals::MetaContactEvent(WPARAM wParam, LPARAM lParam)
+int CGlobals::MetaContactEvent(WPARAM hContact, LPARAM lParam)
 {
-	if (wParam) {
-		CContactCache *c = CContactCache::getContactCache(wParam);
+	if (hContact) {
+		CContactCache *c = CContactCache::getContactCache(hContact);
 		if (c) {
 			c->updateMeta(true);
 			if (c->getHwnd()) {
-- 
cgit v1.2.3