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 --- src/modules/clist/clistmod.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/modules/clist/clistmod.cpp') diff --git a/src/modules/clist/clistmod.cpp b/src/modules/clist/clistmod.cpp index fdbc75fe82..3c7f6ddc49 100644 --- a/src/modules/clist/clistmod.cpp +++ b/src/modules/clist/clistmod.cpp @@ -148,7 +148,7 @@ static int ProtocolAck(WPARAM, LPARAM lParam) if (caps & PF1_SERVERCLIST) { HANDLE hContact = db_find_first(); while (hContact) { - char *szProto = (char *) CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM) hContact, 0); + char *szProto = GetContactProto(hContact); if (szProto != NULL && !strcmp(szProto, ack->szModule)) if (db_get_b(hContact, "CList", "Delete", 0)) CallService(MS_DB_CONTACT_DELETE, (WPARAM) hContact, 0); @@ -187,7 +187,7 @@ int fnIconFromStatusMode(const char *szProto, int status, HANDLE) static INT_PTR GetContactIcon(WPARAM wParam, LPARAM) { - char *szProto = (char *) CallService(MS_PROTO_GETCONTACTBASEPROTO, wParam, 0); + char *szProto = GetContactProto((HANDLE)wParam); HANDLE hContact = (HANDLE)wParam; return cli.pfnIconFromStatusMode(szProto, @@ -444,8 +444,8 @@ static INT_PTR CompareContacts(WPARAM wParam, LPARAM lParam) char *szProto1, *szProto2; int rc; - szProto1 = (char *) CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM) a, 0); - szProto2 = (char *) CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM) b, 0); + szProto1 = GetContactProto(a); + szProto2 = GetContactProto(b); statusa = db_get_w((HANDLE) a, SAFESTRING(szProto1), "Status", ID_STATUS_OFFLINE); statusb = db_get_w((HANDLE) b, SAFESTRING(szProto2), "Status", ID_STATUS_OFFLINE); -- cgit v1.2.3