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/AimOscar/src/aim.cpp  | 2 ++
 protocols/AimOscar/src/chat.cpp | 4 ++--
 protocols/AimOscar/src/stdafx.h | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'protocols/AimOscar/src')

diff --git a/protocols/AimOscar/src/aim.cpp b/protocols/AimOscar/src/aim.cpp
index 6650975186..2355754267 100644
--- a/protocols/AimOscar/src/aim.cpp
+++ b/protocols/AimOscar/src/aim.cpp
@@ -22,6 +22,7 @@ char AIM_CAP_MIRANDA[16] = "MirandaA";
 
 int hLangpack;
 
+CLIST_INTERFACE *pcli;
 HINSTANCE hInstance;
 
 /////////////////////////////////////////////////////////////////////////////
@@ -100,6 +101,7 @@ static int protoUninit(PROTO_INTERFACE* ppro)
 extern "C" int __declspec(dllexport) Load(void)
 {
 	mir_getLP(&pluginInfo);
+	mir_getCLI();
 
 	HookEvent(ME_SYSTEM_MODULESLOADED, OnModulesLoaded);
 
diff --git a/protocols/AimOscar/src/chat.cpp b/protocols/AimOscar/src/chat.cpp
index 09ab42eecc..9d43570ab6 100644
--- a/protocols/AimOscar/src/chat.cpp
+++ b/protocols/AimOscar/src/chat.cpp
@@ -69,8 +69,8 @@ void CAimProto::chat_event(const char* id, const char* sn, int evt, const TCHAR*
 	TCHAR* snt = mir_a2t(sn);
 
 	MCONTACT hContact = contact_from_sn(sn);
-	TCHAR* nick = hContact ? (TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, 
-		WPARAM(hContact), GCDNF_TCHAR) : snt;
+	TCHAR* nick = hContact ? (TCHAR*)pcli->pfnGetContactDisplayName(
+		WPARAM(hContact), 0) : snt;
 
 	GCDEST gcd = { m_szModuleName, idt, evt };
 	GCEVENT gce = { sizeof(gce), &gcd };
diff --git a/protocols/AimOscar/src/stdafx.h b/protocols/AimOscar/src/stdafx.h
index f9d92fbd30..dfb105bd1c 100644
--- a/protocols/AimOscar/src/stdafx.h
+++ b/protocols/AimOscar/src/stdafx.h
@@ -35,7 +35,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 #include <m_avatars.h>
 #include <m_button.h>
 #include <m_chat.h>
-#include <m_clistint.h>
+#include <m_clist.h>
 #include <m_database.h>
 #include <m_history.h>
 #include <m_idle.h>
-- 
cgit v1.2.3