"we don't need these variables" (c) Pink Floyd

git-svn-id: http://svn.miranda-ng.org/main/trunk@8101 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

2 files changed, 5 insertions, 6 deletions

diff --git a/protocols/GTalkExt/src/avatar.cpp b/protocols/GTalkExt/src/avatar.cpp
index 4755c3da0a..e3ded257f1 100644
--- a/protocols/GTalkExt/src/avatar.cpp
+++ b/protocols/GTalkExt/src/avatar.cpp
@@ -105,13 +105,13 @@ VOID CALLBACK CallSetAvatar(PVOID lpParameter, BOOLEAN TimerOrWaitFired)
 	}

 }

 

-int AvaChanged(WPARAM wParam, LPARAM lParam)

+int AvaChanged(WPARAM hContact, LPARAM lParam)

 {

-	if (!lParam && db_get_b(wParam, SHORT_PLUGIN_NAME, PSEUDOCONTACT_FLAG, 0)) {

+	if (!lParam && db_get_b(hContact, SHORT_PLUGIN_NAME, PSEUDOCONTACT_FLAG, 0)) {

 		BOOL enqueued = FALSE;

 		AVACHANGED *ach = (AVACHANGED*)malloc(sizeof(AVACHANGED));

 		__try {

-			ach->hContact = wParam;

+			ach->hContact = hContact;

 			enqueued = CreateTimerQueueTimer(&ach->hTimer, NULL, CallSetAvatar, ach, SET_AVATAR_INTERVAL, 0, WT_EXECUTEONLYONCE);

 		}

 		__finally {

diff --git a/protocols/GTalkExt/src/handlers.cpp b/protocols/GTalkExt/src/handlers.cpp
index 8e31d7bf89..96ac5e94e6 100644
--- a/protocols/GTalkExt/src/handlers.cpp
+++ b/protocols/GTalkExt/src/handlers.cpp
@@ -424,10 +424,9 @@ int OnExtListInit(WPARAM wParam, LPARAM lParam)
 // for our pseudo contact only our own popups are allowed

 // 0 = allowed, 1 = disallowed

 

-int OnFilterPopup(WPARAM wParam, LPARAM lParam)

+int OnFilterPopup(WPARAM hContact, LPARAM lParam)

 {

-	MCONTACT hContact = wParam;

-	if ( !db_get_b(hContact, SHORT_PLUGIN_NAME, PSEUDOCONTACT_FLAG, 0))

+	if (!db_get_b(hContact, SHORT_PLUGIN_NAME, PSEUDOCONTACT_FLAG, 0))

 		return 0;

 

 	return (lParam != (LPARAM)&PopupProc);