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_mw/src/clistmod.cpp      | 2 +-
 plugins/Clist_mw/src/clistsettings.cpp | 2 +-
 plugins/Clist_mw/src/contact.cpp       | 5 +++--
 3 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'plugins/Clist_mw/src')

diff --git a/plugins/Clist_mw/src/clistmod.cpp b/plugins/Clist_mw/src/clistmod.cpp
index edf5ca68cd..dda20b767f 100644
--- a/plugins/Clist_mw/src/clistmod.cpp
+++ b/plugins/Clist_mw/src/clistmod.cpp
@@ -85,7 +85,7 @@ int ExtIconFromStatusMode(HANDLE hContact, const char *szProto,int status)
 		if (strcmp(szProto,"MetaContacts") == 0 ) {
 			hContact = (HANDLE)CallService(MS_MC_GETMOSTONLINECONTACT,(UINT)hContact,0);
 			if ( hContact != 0 ) {
-				szProto = (char*)CallService(MS_PROTO_GETCONTACTBASEPROTO,(UINT)hContact,0);
+				szProto = GetContactProto((UINT)hContact,0);
 				status = db_get_w(hContact,szProto,"Status",ID_STATUS_OFFLINE);
 			}
 		}
diff --git a/plugins/Clist_mw/src/clistsettings.cpp b/plugins/Clist_mw/src/clistsettings.cpp
index fb0c14e989..c0dd11b077 100644
--- a/plugins/Clist_mw/src/clistsettings.cpp
+++ b/plugins/Clist_mw/src/clistsettings.cpp
@@ -330,7 +330,7 @@ int ContactSettingChanged(WPARAM wParam,LPARAM lParam)
 			if ( !strcmp(cws->szSetting,"Hidden")) {
 				InvalidateDisplayNameCacheEntryByPDNE(hContact,pdnce,cws->value.type);		
 				if (cws->value.type == DBVT_DELETED || cws->value.bVal == 0) {
-					char *szProto = (char*)CallService(MS_PROTO_GETCONTACTBASEPROTO,wParam,0);
+					char *szProto = GetContactProto((HANDLE)wParam);
 					ChangeContactIcon(hContact,ExtIconFromStatusMode(hContact, szProto, szProto == NULL ? ID_STATUS_OFFLINE : db_get_w(hContact, szProto, "Status", ID_STATUS_OFFLINE)), 1);  //by FYR
 				}
 			}
diff --git a/plugins/Clist_mw/src/contact.cpp b/plugins/Clist_mw/src/contact.cpp
index 088e125d51..e6c4f31805 100644
--- a/plugins/Clist_mw/src/contact.cpp
+++ b/plugins/Clist_mw/src/contact.cpp
@@ -51,7 +51,7 @@ static int GetContactStatus(HANDLE hContact)
 	
 	char *szProto;
 
-	szProto = (char*)CallService(MS_PROTO_GETCONTACTBASEPROTO,(WPARAM)hContact,0);
+	szProto = GetContactProto(hContact,0);
 	if (szProto == NULL) return ID_STATUS_OFFLINE;
 	return db_get_w(hContact,szProto,"Status",ID_STATUS_OFFLINE);
 	*/
@@ -181,6 +181,7 @@ INT_PTR ContactChangeGroup(WPARAM wParam,LPARAM lParam)
 		DBDeleteContactSetting((HANDLE)wParam,"CList","Group");
 	else
 		db_set_s((HANDLE)wParam,"CList","Group",(char*)CallService(MS_CLIST_GROUPGETNAME2,lParam,(LPARAM)(int*)NULL));
-	CallService(MS_CLUI_CONTACTADDED,wParam,ExtIconFromStatusMode((HANDLE)wParam,(char*)CallService(MS_PROTO_GETCONTACTBASEPROTO,wParam,0),GetContactStatus((HANDLE)wParam)));
+
+	CallService(MS_CLUI_CONTACTADDED,wParam,ExtIconFromStatusMode((HANDLE)wParam, GetContactProto((HANDLE)wParam), GetContactStatus((HANDLE)wParam)));
 	return 0;
 }
-- 
cgit v1.2.3