From 10bc9e42dfba6ed8be41199243d688c2e367dc0d Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Tue, 30 Jun 2015 18:59:38 +0000
Subject: 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
---
 protocols/MSN/src/msn.cpp     | 3 ++-
 protocols/MSN/src/msn_std.cpp | 2 +-
 protocols/MSN/src/stdafx.h    | 1 -
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'protocols/MSN/src')

diff --git a/protocols/MSN/src/msn.cpp b/protocols/MSN/src/msn.cpp
index 1b0f0b43a6..d7e4f56f94 100644
--- a/protocols/MSN/src/msn.cpp
+++ b/protocols/MSN/src/msn.cpp
@@ -24,8 +24,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "msn_proto.h"
 #include "version.h"
 
+CLIST_INTERFACE *pcli;
 HINSTANCE hInst;
-
 int hLangpack;
 
 /////////////////////////////////////////////////////////////////////////////////////////
@@ -111,6 +111,7 @@ static int msnProtoUninit(CMsnProto* ppro)
 extern "C" int __declspec(dllexport) Load(void)
 {
 	mir_getLP(&pluginInfo);
+	mir_getCLI();
 
 	HookEvent(ME_SYSTEM_MODULESLOADED, OnModulesLoaded);
 
diff --git a/protocols/MSN/src/msn_std.cpp b/protocols/MSN/src/msn_std.cpp
index a29db7b667..f9e956780a 100644
--- a/protocols/MSN/src/msn_std.cpp
+++ b/protocols/MSN/src/msn_std.cpp
@@ -46,7 +46,7 @@ void CMsnProto::setStringUtf(MCONTACT hContact, const char* name, const char* va
 TCHAR* CMsnProto::GetContactNameT(MCONTACT hContact)
 {
 	if (hContact)
-		return (TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, WPARAM(hContact), GCDNF_TCHAR);
+		return (TCHAR*)pcli->pfnGetContactDisplayName(WPARAM(hContact), 0);
 
 	CONTACTINFO ci = { 0 };
 	ci.cbSize = sizeof(ci);
diff --git a/protocols/MSN/src/stdafx.h b/protocols/MSN/src/stdafx.h
index 5bdd6c9098..1f34366308 100644
--- a/protocols/MSN/src/stdafx.h
+++ b/protocols/MSN/src/stdafx.h
@@ -37,7 +37,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <newpluginapi.h>
 
 #include <m_clist.h>
-#include <m_clistint.h>
 #include <m_clui.h>
 #include <m_contacts.h>
 #include <m_idle.h>
-- 
cgit v1.2.3