From 1925d3521846f4e6683d3d537cc41de9c9bd7250 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Tue, 11 Feb 2014 19:01:03 +0000 Subject: "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 --- plugins/SecureIM/src/svcs_clist.cpp | 8 +++----- plugins/SecureIM/src/svcs_srmm.cpp | 7 +++---- 2 files changed, 6 insertions(+), 9 deletions(-) (limited to 'plugins/SecureIM/src') diff --git a/plugins/SecureIM/src/svcs_clist.cpp b/plugins/SecureIM/src/svcs_clist.cpp index 7af74df185..c12a4d1162 100644 --- a/plugins/SecureIM/src/svcs_clist.cpp +++ b/plugins/SecureIM/src/svcs_clist.cpp @@ -1,9 +1,8 @@ #include "commonheaders.h" -int __cdecl onContactSettingChanged(WPARAM wParam,LPARAM lParam) { - - MCONTACT hContact = wParam; +int __cdecl onContactSettingChanged(WPARAM hContact, LPARAM lParam) +{ DBCONTACTWRITESETTING *cws=(DBCONTACTWRITESETTING*)lParam; if (!hContact || strcmp(cws->szSetting,"Status")) return 0; @@ -65,9 +64,8 @@ int __cdecl onExtraImageApplying(WPARAM wParam, LPARAM) return 0; } -int __cdecl onRebuildContactMenu(WPARAM wParam,LPARAM lParam) +int __cdecl onRebuildContactMenu(WPARAM hContact,LPARAM lParam) { - MCONTACT hContact = wParam; BOOL bMC = isProtoMetaContacts(hContact); if (bMC ) hContact = getMostOnline(hContact); // возьмем тот, через который пойдет сообщение pUinKey ptr = getUinKey(hContact); diff --git a/plugins/SecureIM/src/svcs_srmm.cpp b/plugins/SecureIM/src/svcs_srmm.cpp index 5abc86a7e1..de0b384350 100644 --- a/plugins/SecureIM/src/svcs_srmm.cpp +++ b/plugins/SecureIM/src/svcs_srmm.cpp @@ -9,9 +9,8 @@ int __cdecl onWindowEvent(WPARAM, LPARAM lParam) return 0; } -int __cdecl onIconPressed(WPARAM wParam, LPARAM lParam) +int __cdecl onIconPressed(WPARAM hContact, LPARAM lParam) { - MCONTACT hContact = wParam; if (isProtoMetaContacts(hContact)) hContact = getMostOnline(hContact); // возьмем тот, через который пойдет сообщение @@ -21,9 +20,9 @@ int __cdecl onIconPressed(WPARAM wParam, LPARAM lParam) if (!isContactPGP(hContact) && !isContactGPG(hContact) && !isChatRoom(hContact)) { if (isContactSecured(hContact) & SECURED) - Service_DisableIM(wParam,0); + Service_DisableIM(hContact, 0); else - Service_CreateIM(wParam,0); + Service_CreateIM(hContact, 0); } return 0; -- cgit v1.2.3