typed stub for MS_PROTO_GETCONTACTBASEPROTO

git-svn-id: http://svn.miranda-ng.org/main/trunk@2480 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

8 files changed, 8 insertions, 8 deletions

diff --git a/plugins/Clist_modern/src/modern_awaymsg.cpp b/plugins/Clist_modern/src/modern_awaymsg.cpp
index 77e06dff5e..ddf27062dd 100644
--- a/plugins/Clist_modern/src/modern_awaymsg.cpp
+++ b/plugins/Clist_modern/src/modern_awaymsg.cpp
@@ -208,7 +208,7 @@ void amRequestAwayMsg(HANDLE hContact)
 	if ( !g_CluiData.bInternalAwayMsgDiscovery || !hContact) 

 		return;

 	//Do not re-ask for chat rooms   

-	szProto = (char *) CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM) hContact, 0);

+	szProto = GetContactProto(hContact);

 	if (szProto == NULL || db_get_b(hContact, szProto, "ChatRoom", 0) != 0) 	

 		return;

 	amAddHandleToChain(hContact);        

diff --git a/plugins/Clist_modern/src/modern_cachefuncs.cpp b/plugins/Clist_modern/src/modern_cachefuncs.cpp
index d6c7cf2338..6ff4f8fdec 100644
--- a/plugins/Clist_modern/src/modern_cachefuncs.cpp
+++ b/plugins/Clist_modern/src/modern_cachefuncs.cpp
@@ -209,7 +209,7 @@ void CSmileyString::ReplaceSmileys(struct SHORTDATA *dat, ClcCacheEntry *pdnce,
 		if (db_get_b(NULL,"CLC","Meta",SETTING_USEMETAICON_DEFAULT) != 1 && pdnce->m_cache_cszProto != NULL && g_szMetaModuleName && strcmp(pdnce->m_cache_cszProto, g_szMetaModuleName) == 0) {

 			HANDLE hContact = (HANDLE)CallService(MS_MC_GETMOSTONLINECONTACT, (LPARAM)pdnce->hContact, 0);

 			if (hContact != 0)

-				sp.Protocolname = (char*)CallService(MS_PROTO_GETCONTACTBASEPROTO, (LPARAM)hContact, 0);

+				sp.Protocolname = GetContactProto(hContact);

 		}

 	}

 	else sp.Protocolname = "clist";

diff --git a/plugins/Clist_modern/src/modern_clc.cpp b/plugins/Clist_modern/src/modern_clc.cpp
index e2b3aea184..054d69648d 100644
--- a/plugins/Clist_modern/src/modern_clc.cpp
+++ b/plugins/Clist_modern/src/modern_clc.cpp
@@ -1550,7 +1550,7 @@ static LRESULT clcOnIntmIconChanged(ClcData *dat, HWND hwnd, UINT msg, WPARAM wP
 	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

diff --git a/plugins/Clist_modern/src/modern_clcitems.cpp b/plugins/Clist_modern/src/modern_clcitems.cpp
index 9a27760bea..dd155e74bb 100644
--- a/plugins/Clist_modern/src/modern_clcitems.cpp
+++ b/plugins/Clist_modern/src/modern_clcitems.cpp
@@ -718,7 +718,7 @@ int __fastcall CLVM_GetContactHiddenStatus(HANDLE hContact, char *szProto, ClcDa
 	}

 	if (pdnce && g_CluiData.bFilterEffective && !fEmbedded) {

 		if (szProto == NULL)

-			szProto = (char *)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)hContact, 0);

+			szProto = GetContactProto(hContact);

 		// check stickies first (priority), only if we really have stickies defined (CLVM_STICKY_CONTACTS is set).

 		if (g_CluiData.bFilterEffective & CLVM_STICKY_CONTACTS) {

 			if ((dwLocalMask = db_get_dw(hContact, CLVM_MODULE, g_CluiData.current_viewmode, 0)) != 0) {

diff --git a/plugins/Clist_modern/src/modern_clistevents.cpp b/plugins/Clist_modern/src/modern_clistevents.cpp
index 7745330956..f15f7f0045 100644
--- a/plugins/Clist_modern/src/modern_clistevents.cpp
+++ b/plugins/Clist_modern/src/modern_clistevents.cpp
@@ -126,7 +126,7 @@ struct CListEvent* cli_AddEvent(CLISTEVENT *cle)
 							return p;

 			}	}	}

 

-			szProto = (char*) CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM) p->cle.hContact, 0);

+			szProto = GetContactProto(p->cle.hContact);

 			szName = pcli->pfnGetContactDisplayName(p->cle.hContact, 0);

 			if (szProto && szName) {

 				nmi = (struct NotifyMenuItemExData *) malloc(sizeof(struct NotifyMenuItemExData));

diff --git a/plugins/Clist_modern/src/modern_clistmod.cpp b/plugins/Clist_modern/src/modern_clistmod.cpp
index eef6c834ca..2adc55d19e 100644
--- a/plugins/Clist_modern/src/modern_clistmod.cpp
+++ b/plugins/Clist_modern/src/modern_clistmod.cpp
@@ -166,7 +166,7 @@ int GetContactIconC(ClcCacheEntry *cacheEntry)
 INT_PTR GetContactIcon(WPARAM wParam,LPARAM lParam)

 {

 	int status;

-	char *szProto = (char *) CallService(MS_PROTO_GETCONTACTBASEPROTO, wParam, 0);

+	char *szProto = GetContactProto((HANDLE)wParam);

 	if (szProto == NULL)

 		status = ID_STATUS_OFFLINE;

 	else

diff --git a/plugins/Clist_modern/src/modern_clistsettings.cpp b/plugins/Clist_modern/src/modern_clistsettings.cpp
index 484ba96b29..badfa95153 100644
--- a/plugins/Clist_modern/src/modern_clistsettings.cpp
+++ b/plugins/Clist_modern/src/modern_clistsettings.cpp
@@ -499,7 +499,7 @@ int ContactSettingChanged(WPARAM wParam,LPARAM lParam)
 		else if ( !strcmp(cws->szSetting,"Hidden")) {

 			InvalidateDNCEbyPointer(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);

 				cli_ChangeContactIcon(hContact,ExtIconFromStatusMode(hContact,szProto,szProto == NULL?ID_STATUS_OFFLINE:db_get_w(hContact,szProto,"Status",ID_STATUS_OFFLINE)),1);  //by FYR

 			}

 			pcli->pfnClcBroadcast(CLM_AUTOREBUILD,0, 0);

diff --git a/plugins/Clist_modern/src/modern_contact.cpp b/plugins/Clist_modern/src/modern_contact.cpp
index 4f1de747b5..74ee963705 100644
--- a/plugins/Clist_modern/src/modern_contact.cpp
+++ b/plugins/Clist_modern/src/modern_contact.cpp
@@ -179,7 +179,7 @@ INT_PTR ContactChangeGroup(WPARAM wParam,LPARAM lParam)
 		db_unset((HANDLE)wParam,"CList","Group");

 	else

 		db_set_ws((HANDLE)wParam,"CList","Group",pcli->pfnGetGroupName(lParam, 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;

 }