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

3 files changed, 7 insertions, 7 deletions

diff --git a/plugins/AvatarHistory/src/AvatarDlg.cpp b/plugins/AvatarHistory/src/AvatarDlg.cpp
index 3d88738d1e..a748ae039a 100644
--- a/plugins/AvatarHistory/src/AvatarDlg.cpp
+++ b/plugins/AvatarHistory/src/AvatarDlg.cpp
@@ -133,11 +133,9 @@ static INT_PTR CALLBACK AvatarDlgProc(HWND hwnd,UINT uMsg,WPARAM wParam,LPARAM l
 			else

 				FillAvatarListFromFiles(hwndList, data->hContact);

 

-			TCHAR *displayName = (TCHAR*) CallService(MS_CLIST_GETCONTACTDISPLAYNAME,(WPARAM)data->hContact,GCDNF_TCHAR);

-			if (displayName)

-			{

+			TCHAR *displayName = pcli->pfnGetContactDisplayName(data->hContact, 0);

+			if (displayName) {

 				TCHAR title[MAX_PATH];

-

 				mir_sntprintf(title, _countof(title), TranslateT("Avatar History for %s"), displayName);

 				SetWindowText(hwnd, title);

 			}

@@ -547,7 +545,7 @@ int ShowSaveDialog(HWND hwnd, TCHAR* fn, MCONTACT hContact)
 	_tcsncpy_s(file, (_tcsrchr(fn, '\\') + 1), _TRUNCATE);

 	ofn.lpstrFile = file;

 

-	TCHAR *displayName = (TCHAR*) CallService(MS_CLIST_GETCONTACTDISPLAYNAME,hContact,GCDNF_TCHAR);

+	TCHAR *displayName = pcli->pfnGetContactDisplayName(hContact, 0);

 	TCHAR title[MAX_PATH];

 	if (displayName)

 	{

diff --git a/plugins/AvatarHistory/src/AvatarHistory.cpp b/plugins/AvatarHistory/src/AvatarHistory.cpp
index 04b88b5942..bbf9da67b1 100644
--- a/plugins/AvatarHistory/src/AvatarHistory.cpp
+++ b/plugins/AvatarHistory/src/AvatarHistory.cpp
@@ -23,6 +23,7 @@ Avatar History Plugin
 */

 #include "stdafx.h"

 

+CLIST_INTERFACE *pcli;

 HINSTANCE hInst;

 

 DWORD mirVer;

@@ -293,6 +294,7 @@ static INT_PTR CALLBACK FirstRunDlgProc(HWND hwnd,UINT uMsg,WPARAM wParam,LPARAM
 extern "C" __declspec(dllexport) int Load(void)

 {

 	mir_getLP(&pluginInfo);

+	mir_getCLI();

 

 	CoInitialize(NULL);

 

diff --git a/plugins/AvatarHistory/src/popup.cpp b/plugins/AvatarHistory/src/popup.cpp
index fc332ca8b7..d8ada07c4c 100644
--- a/plugins/AvatarHistory/src/popup.cpp
+++ b/plugins/AvatarHistory/src/popup.cpp
@@ -107,7 +107,7 @@ void ShowPopupEx(MCONTACT hContact, const TCHAR *title, const TCHAR *description
 		if (title != NULL)

 			mir_tstrncpy(ppd.lptzContactName, title, _countof(ppd.lptzContactName));

 		else if (hContact != NULL)

-			mir_tstrncpy(ppd.lptzContactName, (TCHAR *)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, hContact, GCDNF_TCHAR),

+			mir_tstrncpy(ppd.lptzContactName, (TCHAR *)pcli->pfnGetContactDisplayName(hContact, 0),

 					_countof(ppd.lptzContactName));

 

 		if (description != NULL)

@@ -174,7 +174,7 @@ void ShowPopupEx(MCONTACT hContact, const TCHAR *title, const TCHAR *description
 	}

 	else

 	{

-		MessageBox(NULL, description, title ? title : (TCHAR *)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, hContact, GCDNF_TCHAR),

+		MessageBox(NULL, description, title ? title : (TCHAR *)pcli->pfnGetContactDisplayName(hContact, 0),

 			MB_OK);

 	}