From bd8a04455d9c991c15df2287e091abe4ba054efb Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sun, 25 Nov 2012 12:54:45 +0000 Subject: typed stub for MS_PROTO_GETCONTACTBASEPROTO git-svn-id: http://svn.miranda-ng.org/main/trunk@2480 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/Twitter/src/contacts.cpp | 13 ++++--------- protocols/Twitter/src/theme.cpp | 3 +-- 2 files changed, 5 insertions(+), 11 deletions(-) (limited to 'protocols/Twitter/src') diff --git a/protocols/Twitter/src/contacts.cpp b/protocols/Twitter/src/contacts.cpp index 902f485ea2..dae818d52b 100644 --- a/protocols/Twitter/src/contacts.cpp +++ b/protocols/Twitter/src/contacts.cpp @@ -212,18 +212,13 @@ int TwitterProto::OnContactDeleted(WPARAM wParam,LPARAM lParam) bool TwitterProto::IsMyContact(HANDLE hContact,bool include_chat) { - const char *proto = reinterpret_cast( CallService(MS_PROTO_GETCONTACTBASEPROTO, - reinterpret_cast(hContact),0)); - - if(proto && strcmp(m_szModuleName,proto) == 0) - { + char *proto = GetContactProto(hContact); + if(proto && strcmp(m_szModuleName,proto) == 0) { if(include_chat) return true; - else - return DBGetContactSettingByte(hContact,m_szModuleName,"ChatRoom",0) == 0; + return DBGetContactSettingByte(hContact,m_szModuleName,"ChatRoom",0) == 0; } - else - return false; + else return false; } HANDLE TwitterProto::UsernameToHContact(const char *name) diff --git a/protocols/Twitter/src/theme.cpp b/protocols/Twitter/src/theme.cpp index 82df5563b0..18cc7ce7f8 100644 --- a/protocols/Twitter/src/theme.cpp +++ b/protocols/Twitter/src/theme.cpp @@ -102,8 +102,7 @@ static HANDLE g_hMenuEvts[3]; // Helper functions static TwitterProto * GetInstanceByHContact(HANDLE hContact) { - char *proto = reinterpret_cast( CallService(MS_PROTO_GETCONTACTBASEPROTO, - reinterpret_cast(hContact),0)); + char *proto = GetContactProto(hContact); if(!proto) return 0; -- cgit v1.2.3