From 68d3fd47bb9b75e65859d14199ffee01f16ac9a7 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Mon, 10 Feb 2014 20:47:51 +0000 Subject: HCONTACT is not needed anymore git-svn-id: http://svn.miranda-ng.org/main/trunk@8086 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/SecureIM/src/crypt_metacontacts.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'plugins/SecureIM/src/crypt_metacontacts.cpp') diff --git a/plugins/SecureIM/src/crypt_metacontacts.cpp b/plugins/SecureIM/src/crypt_metacontacts.cpp index 113bf22abc..16304cffac 100644 --- a/plugins/SecureIM/src/crypt_metacontacts.cpp +++ b/plugins/SecureIM/src/crypt_metacontacts.cpp @@ -1,6 +1,6 @@ #include "commonheaders.h" -BOOL isProtoMetaContacts(HCONTACT hContact) +BOOL isProtoMetaContacts(MCONTACT hContact) { if (bMetaContacts) { LPSTR proto = GetContactProto(hContact); @@ -10,37 +10,37 @@ BOOL isProtoMetaContacts(HCONTACT hContact) return false; } -BOOL isDefaultSubContact(HCONTACT hContact) +BOOL isDefaultSubContact(MCONTACT hContact) { if (bMetaContacts) - return (HCONTACT)CallService(MS_MC_GETDEFAULTCONTACT,(WPARAM)CallService(MS_MC_GETMETACONTACT,(WPARAM)hContact,0),0) == hContact; + return (MCONTACT)CallService(MS_MC_GETDEFAULTCONTACT,(WPARAM)CallService(MS_MC_GETMETACONTACT,(WPARAM)hContact,0),0) == hContact; return false; } -HCONTACT getMetaContact(HCONTACT hContact) +MCONTACT getMetaContact(MCONTACT hContact) { if (bMetaContacts) - return (HCONTACT)CallService(MS_MC_GETMETACONTACT, (WPARAM)hContact, 0); + return (MCONTACT)CallService(MS_MC_GETMETACONTACT, (WPARAM)hContact, 0); return 0; } -HCONTACT getMostOnline(HCONTACT hContact) +MCONTACT getMostOnline(MCONTACT hContact) { if (bMetaContacts) - return (HCONTACT)CallService(MS_MC_GETMOSTONLINECONTACT, (WPARAM)hContact, 0); + return (MCONTACT)CallService(MS_MC_GETMOSTONLINECONTACT, (WPARAM)hContact, 0); return 0; } // remove all secureim connections on subcontacts -void DeinitMetaContact(HCONTACT hContact) +void DeinitMetaContact(MCONTACT hContact) { - HCONTACT hMetaContact = isProtoMetaContacts(hContact) ? hContact : getMetaContact(hContact); + MCONTACT hMetaContact = isProtoMetaContacts(hContact) ? hContact : getMetaContact(hContact); if (hMetaContact) { for (int i=0; i < CallService(MS_MC_GETNUMCONTACTS,(WPARAM)hMetaContact,0); i++) { - HCONTACT hSubContact = (HCONTACT)CallService(MS_MC_GETSUBCONTACT, (WPARAM)hMetaContact, i); + MCONTACT hSubContact = (MCONTACT)CallService(MS_MC_GETSUBCONTACT, (WPARAM)hMetaContact, i); if (hSubContact && (isContactSecured(hSubContact)&SECURED)) CallContactService(hSubContact,PSS_MESSAGE, PREF_METANODB, (LPARAM)SIG_DEIN); } -- cgit v1.2.3