MS_CLIST_GETSTATUSMODEDESCRIPTION & MS_CLIST_GETCONTACTDISPLAYNAME replaced with pcli->* members

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

2 files changed, 4 insertions, 2 deletions

diff --git a/plugins/FileAsMessage/src/dialog.cpp b/plugins/FileAsMessage/src/dialog.cpp
index 1edaf90842..9e881ae705 100644
--- a/plugins/FileAsMessage/src/dialog.cpp
+++ b/plugins/FileAsMessage/src/dialog.cpp
@@ -106,7 +106,7 @@ void MakePopupMsg(HWND hDlg, MCONTACT hContact, char *msg)
 	POPUPDATA ppd = { 0 };

 	ppd.lchContact = hContact;

 	ppd.lchIcon = LoadIcon(hInst, MAKEINTRESOURCE(IDI_SMALLICON));

-	mir_tstrcpy(ppd.lpzContactName, (char *)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, hContact, 0));

+	mir_tstrcpy(ppd.lpzContactName, (char *)pcli->pfnGetContactDisplayName(hContact, 0));

 	mir_tstrcpy(ppd.lpzText, msg);

 	ppd.colorBack = GetSysColor(COLOR_INFOBK);

 	ppd.colorText = GetSysColor(COLOR_INFOTEXT);

@@ -241,7 +241,7 @@ void FILEECHO::updateTitle()
 {

 	char newtitle[256], *contactName;

 

-	contactName = (char*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, hContact, 0);

+	contactName = (char*)pcli->pfnGetContactDisplayName(hContact, 0);

 	if (iState == STATE_OPERATE && chunkCount != 0)

 		mir_snprintf(newtitle, _countof(newtitle), "%d%% - %s: %s", chunkSent * 100 / chunkCount, Translate(szFEMode[inSend]), contactName);

 	else

diff --git a/plugins/FileAsMessage/src/main.cpp b/plugins/FileAsMessage/src/main.cpp
index 3bd42de919..edd0769a77 100644
--- a/plugins/FileAsMessage/src/main.cpp
+++ b/plugins/FileAsMessage/src/main.cpp
@@ -15,6 +15,7 @@ PLUGININFOEX pluginInfo =
 	{ 0x34b5a402, 0x1b79, 0x4246, { 0xb0, 0x41, 0x43, 0xd0, 0xb5, 0x90, 0xae, 0x2c } }

 };

 

+CLIST_INTERFACE *pcli;

 MWindowList hFileList;

 HINSTANCE hInst;

 int hLangpack;

@@ -187,6 +188,7 @@ static int OnModulesLoaded(WPARAM wparam, LPARAM lparam)
 extern "C" __declspec(dllexport) int Load(void)

 {

 	mir_getLP(&pluginInfo);

+	mir_getCLI();

 

 	InitCRC32();