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 --- plugins/AvatarHistory/src/AvatarDlg.cpp | 2 +- plugins/AvatarHistory/src/AvatarHistory.cpp | 8 ++++---- plugins/AvatarHistory/src/icolib.cpp | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'plugins/AvatarHistory') diff --git a/plugins/AvatarHistory/src/AvatarDlg.cpp b/plugins/AvatarHistory/src/AvatarDlg.cpp index efdb07610a..f499fcb8ee 100644 --- a/plugins/AvatarHistory/src/AvatarDlg.cpp +++ b/plugins/AvatarHistory/src/AvatarDlg.cpp @@ -530,7 +530,7 @@ int PreBuildContactMenu(WPARAM wParam,LPARAM lParam) clmi.cbSize = sizeof(clmi); clmi.flags = CMIM_FLAGS; - char *proto = (char*) CallService(MS_PROTO_GETCONTACTBASEPROTO, wParam, 0); + char *proto = GetContactProto((HANDLE)wParam); if (!ProtocolEnabled(proto)) clmi.flags |= CMIF_HIDDEN; diff --git a/plugins/AvatarHistory/src/AvatarHistory.cpp b/plugins/AvatarHistory/src/AvatarHistory.cpp index 0cd94a15f2..68fed732d0 100644 --- a/plugins/AvatarHistory/src/AvatarHistory.cpp +++ b/plugins/AvatarHistory/src/AvatarHistory.cpp @@ -253,7 +253,7 @@ BOOL ContactEnabled(HANDLE hContact, char *setting, int def) if (hContact == NULL) return FALSE; - char *proto = (char *) CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM) hContact, 0); + char *proto = GetContactProto(hContact); if (!ProtocolEnabled(proto)) return FALSE; @@ -403,7 +403,7 @@ static int AvatarChanged(WPARAM wParam, LPARAM lParam) return 0; } - char *proto = (char *) CallService(MS_PROTO_GETCONTACTBASEPROTO, wParam, 0); + char *proto = GetContactProto((HANDLE)wParam); if (proto == NULL) { ShowDebugPopup(hContact, _T("AVH Debug"), _T("Invalid protocol... skipping")); @@ -545,7 +545,7 @@ static int AvatarChanged(WPARAM wParam, LPARAM lParam) { DBEVENTINFO AvatarEvent = { 0 }; AvatarEvent.cbSize = sizeof(AvatarEvent); - AvatarEvent.szModule = (char*)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)hContact, 0); + AvatarEvent.szModule = GetContactProto(hContact); AvatarEvent.flags = flags; AvatarEvent.timestamp = (DWORD) time(NULL); AvatarEvent.eventType = EVENTTYPE_AVATAR_CHANGE; @@ -698,7 +698,7 @@ TCHAR * GetContactFolder(TCHAR *fn, HANDLE hContact) { TCHAR uin[MAX_PATH]; - char *proto = (char *) CallService(MS_PROTO_GETCONTACTBASEPROTO,(WPARAM) hContact, 0); + char *proto = GetContactProto(hContact); GetProtocolFolder(fn, proto); GetUIDFromHContact(hContact, uin, MAX_REGS(uin)); diff --git a/plugins/AvatarHistory/src/icolib.cpp b/plugins/AvatarHistory/src/icolib.cpp index 76bc96d80c..acc5d642c3 100644 --- a/plugins/AvatarHistory/src/icolib.cpp +++ b/plugins/AvatarHistory/src/icolib.cpp @@ -123,7 +123,7 @@ HICON createProtoOverlayedIcon(HANDLE hContact) { HICON icon1 = LoadIconEx(I_OVERLAY); - char *szProto = (char *)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)hContact, 0); + char *szProto = GetContactProto(hContact); HICON icon0 = LoadSkinnedProtoIcon(szProto, ID_STATUS_ONLINE); HICON resIcon = getOverlayedIcon(icon0, icon1, FALSE); -- cgit v1.2.3