"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

1 files changed, 3 insertions, 6 deletions

diff --git a/protocols/Yahoo/src/services.cpp b/protocols/Yahoo/src/services.cpp
index ad342a2b1e..f5e0aa30dc 100644
--- a/protocols/Yahoo/src/services.cpp
+++ b/protocols/Yahoo/src/services.cpp
@@ -80,11 +80,8 @@ void CYahooProto::BroadcastStatus(int s)
 //=======================================================

 //Contact deletion event

 //=======================================================

-int __cdecl CYahooProto::OnContactDeleted(WPARAM wParam, LPARAM lParam)

+int __cdecl CYahooProto::OnContactDeleted(WPARAM hContact, LPARAM lParam)

 {

-	DBVARIANT dbv;

-	MCONTACT hContact = wParam;

-

 	debugLogA("[YahooContactDeleted]");

 

 	if (!m_bLoggedIn)  {//should never happen for Yahoo contacts

@@ -98,6 +95,7 @@ int __cdecl CYahooProto::OnContactDeleted(WPARAM wParam, LPARAM lParam)
 		return 0;

 	}

 

+	DBVARIANT dbv;

 	if (!getString(hContact, YAHOO_LOGINID, &dbv)) {

 		debugLogA("[YahooContactDeleted] Removing %s", dbv.pszVal);

 		remove_buddy(dbv.pszVal, getWord(hContact, "yprotoid", 0));

@@ -495,9 +493,8 @@ void CYahooProto::MenuUninit( void )
 	CallService(MS_CLIST_REMOVECONTACTMENUITEM, (WPARAM)hShowProfileMenuItem, 0);

 }

 

-int __cdecl CYahooProto::OnPrebuildContactMenu(WPARAM wParam, LPARAM)

+int __cdecl CYahooProto::OnPrebuildContactMenu(WPARAM hContact, LPARAM)

 {

-	const MCONTACT hContact = wParam;

 	if (!IsMyContact(hContact)) {

 		debugLogA("[OnPrebuildContactMenu] Not a Yahoo Contact!!!");

 		return 0;