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, 9 insertions, 6 deletions

diff --git a/plugins/BuddyPounce/src/dialog.cpp b/plugins/BuddyPounce/src/dialog.cpp
index c3d7725e15..0f02f3037d 100644
--- a/plugins/BuddyPounce/src/dialog.cpp
+++ b/plugins/BuddyPounce/src/dialog.cpp
@@ -16,7 +16,7 @@ void populateContacts(MCONTACT BPhContact, HWND hwnd2CB)
 		char *szProto = GetContactProto(hContact);

 		if (szProto && (CallProtoService(szProto, PS_GETCAPS, PFLAGNUM_1, 0) & PF1_IM)) {

 			TCHAR name[300];

-			mir_sntprintf(name, _countof(name), _T("%s (%s)"), CallService(MS_CLIST_GETCONTACTDISPLAYNAME, hContact, GCDNF_TCHAR), _A2T(szProto));

+			mir_sntprintf(name, _countof(name), _T("%s (%s)"), pcli->pfnGetContactDisplayName(hContact, 0), _A2T(szProto));

 			int index = SendMessage(hwnd2CB, CB_ADDSTRING, 0, (LPARAM)name);

 			SendMessage(hwnd2CB, CB_SETITEMDATA, index, hContact);

 			if (BPhContact == hContact)

@@ -532,7 +532,7 @@ INT_PTR CALLBACK SendPounceDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lP
 	case WM_TIMER:

 		{

 			TCHAR message[1024];

-			mir_sntprintf(message, _countof(message), TranslateT("Pounce being sent to %s in %d seconds"), CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)spdps->hContact, GCDNF_TCHAR), spdps->timer);

+			mir_sntprintf(message, _countof(message), TranslateT("Pounce being sent to %s in %d seconds"), pcli->pfnGetContactDisplayName(spdps->hContact, 0), spdps->timer);

 			SetDlgItemText(hwnd, LBL_CONTACT, message);

 		}

 		spdps->timer--;

@@ -609,12 +609,12 @@ void CreateMessageAcknowlegedWindow(MCONTACT hContact, int SentSuccess)
 	HWND hwnd = CreateDialogParam(hInst, MAKEINTRESOURCE(IDD_CONFIRMSEND), 0, PounceSentDlgProc, hContact);

 	TCHAR msg[256];

 	if (SentSuccess) {

-		mir_sntprintf(msg, _countof(msg), TranslateT("Message successfully sent to %s"), CallService(MS_CLIST_GETCONTACTDISPLAYNAME, hContact, GCDNF_TCHAR));

+		mir_sntprintf(msg, _countof(msg), TranslateT("Message successfully sent to %s"), pcli->pfnGetContactDisplayName(hContact, 0));

 		SetDlgItemText(hwnd, IDOK, TranslateT("OK"));

 		ShowWindow(GetDlgItem(hwnd, IDCANCEL), 0);

 	}

 	else {

-		mir_sntprintf(msg, _countof(msg), TranslateT("Message failed to send to %s"), CallService(MS_CLIST_GETCONTACTDISPLAYNAME, hContact, GCDNF_TCHAR));

+		mir_sntprintf(msg, _countof(msg), TranslateT("Message failed to send to %s"), pcli->pfnGetContactDisplayName(hContact, 0));

 		SetDlgItemText(hwnd, IDOK, TranslateT("Retry"));

 	}

 	SetDlgItemText(hwnd, LBL_CONTACT, msg);

diff --git a/plugins/BuddyPounce/src/main.cpp b/plugins/BuddyPounce/src/main.cpp
index 23c1d0142f..9fc8e1461a 100644
--- a/plugins/BuddyPounce/src/main.cpp
+++ b/plugins/BuddyPounce/src/main.cpp
@@ -1,5 +1,6 @@
 #include "stdafx.h"

 

+CLIST_INTERFACE *pcli;

 int hLangpack;

 HINSTANCE hInst;

 MWindowList hWindowList;

@@ -231,18 +232,20 @@ INT_PTR AddToPounce(WPARAM wParam, LPARAM lParam)
 extern "C" __declspec(dllexport) int Load(void)

 {

 	mir_getLP(&pluginInfo);

+	mir_getCLI();

+

 	HookEvent(ME_SYSTEM_MODULESLOADED, MainInit);

 	HookEvent(ME_DB_CONTACT_SETTINGCHANGED, UserOnlineSettingChanged); 

 	HookEvent(ME_OPT_INITIALISE, BuddyPounceOptInit);

 	HookEvent(ME_PROTO_ACK, MsgAck);

+

 	CreateServiceFunction("BuddyPounce/MenuCommand", BuddyPounceMenuCommand);

+

 	hWindowList = WindowList_Create();

 

 	/*     service funcitons for other devs...					*/

 	CreateServiceFunction("BuddyPounce/AddSimplePounce", AddSimpleMessage); // add a simple pounce to a contact

 	CreateServiceFunction("BuddyPounce/AddToPounce", AddToPounce); // add to the exsisitng pounce, if there isnt 1 then add a new simple pounce.

-	/* ******************************************************** */

-

 	return 0; 

 }