From bd8a04455d9c991c15df2287e091abe4ba054efb Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
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/Clist_nicer/src/clc.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'plugins/Clist_nicer/src/clc.cpp')

diff --git a/plugins/Clist_nicer/src/clc.cpp b/plugins/Clist_nicer/src/clc.cpp
index 07838053c1..6d80e49cfd 100644
--- a/plugins/Clist_nicer/src/clc.cpp
+++ b/plugins/Clist_nicer/src/clc.cpp
@@ -125,7 +125,7 @@ static int ClcSettingChanged(WPARAM wParam, LPARAM lParam)
 			else if ( !__strcmp(cws->szSetting, "Timezone") || !__strcmp(cws->szSetting, "TzName"))
 				ReloadExtraInfo((HANDLE)wParam);
 		}
-		else if (wParam != 0 && (szProto = (char *)CallService(MS_PROTO_GETCONTACTBASEPROTO, wParam, 0)) != NULL) {
+		else if (wParam != 0 && (szProto = GetContactProto((HANDLE)wParam)) != NULL) {
 			char *id = NULL;
 			if ( !__strcmp(cws->szModule, "Protocol") && !__strcmp(cws->szSetting, "p")) {
 				char *szProto_s;
@@ -352,7 +352,7 @@ LBL_Def:
 				HANDLE hSelItem = NULL;
 				ClcContact *selcontact = NULL;
 
-				char *szProto = (char*) CallService(MS_PROTO_GETCONTACTBASEPROTO, wParam, 0);
+				char *szProto = GetContactProto((HANDLE)wParam);
 				if (szProto == NULL)
 					status = ID_STATUS_OFFLINE;
 				else
@@ -412,7 +412,7 @@ LBL_Def:
 
 			if (contact->bIsMeta && cfg::dat.bMetaAvail && !(cfg::dat.dwFlags & CLUI_USEMETAICONS)) {
 				contact->hSubContact = (HANDLE) CallService(MS_MC_GETMOSTONLINECONTACT, (WPARAM) contact->hContact, 0);
-				contact->metaProto = (char*) CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM) contact->hSubContact, 0);
+				contact->metaProto = GetContactProto(contact->hSubContact);
 				contact->iImage = CallService(MS_CLIST_GETCONTACTICON, (WPARAM) contact->hSubContact, 0);
 				if (contact->extraCacheEntry >= 0 && contact->extraCacheEntry < cfg::nextCacheEntry) {
 					int subIndex = cfg::getCache(contact->hSubContact, contact->metaProto);
@@ -523,7 +523,7 @@ LBL_Def:
 			if ( !FindItem(hwnd, dat, (HANDLE)wParam, &contact, NULL, NULL))
 				break;
 
-			contact->proto = (char*) CallService(MS_PROTO_GETCONTACTBASEPROTO, wParam, 0);
+			contact->proto = GetContactProto((HANDLE)wParam);
 			CallService(MS_CLIST_INVALIDATEDISPLAYNAME, wParam, 0);
 			lstrcpyn(contact->szText, pcli->pfnGetContactDisplayName((HANDLE)wParam, 0), safe_sizeof(contact->szText));
 
-- 
cgit v1.2.3