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

37 files changed, 35 insertions, 44 deletions

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>

diff --git a/protocols/Dummy/src/stdafx.h b/protocols/Dummy/src/stdafx.h
index 7416c2aeef..305d636215 100644
--- a/protocols/Dummy/src/stdafx.h
+++ b/protocols/Dummy/src/stdafx.h
@@ -32,7 +32,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 #include <m_avatars.h>
 #include <m_chat.h>
-#include <m_clistint.h>
+#include <m_clist.h>
 #include <m_database.h>
 #include <m_extraicons.h>
 #include <m_file.h>
diff --git a/protocols/FacebookRM/src/stdafx.h b/protocols/FacebookRM/src/stdafx.h
index bcbf0f6298..c76ce9bba2 100644
--- a/protocols/FacebookRM/src/stdafx.h
+++ b/protocols/FacebookRM/src/stdafx.h
@@ -40,7 +40,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <newpluginapi.h>

 #include <m_avatars.h>

 #include <m_chat.h>

-#include <m_clistint.h>

+#include <m_clist.h>

 #include <m_database.h>

 #include <m_idle.h>

 #include <m_ignore.h>

diff --git a/protocols/Gadu-Gadu/src/core.cpp b/protocols/Gadu-Gadu/src/core.cpp
index efe7df5d0a..f5558e99ad 100644
--- a/protocols/Gadu-Gadu/src/core.cpp
+++ b/protocols/Gadu-Gadu/src/core.cpp
@@ -834,7 +834,7 @@ retry:
 							gce.ptszUID = id;

 							TCHAR* messageT = mir_utf8decodeT(e->event.msg.message);

 							gce.ptszText = messageT;

-							gce.ptszNick = (TCHAR*) CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM) getcontact(e->event.msg.sender, 1, 0, NULL), GCDNF_TCHAR);

+							gce.ptszNick = (TCHAR*) pcli->pfnGetContactDisplayName( getcontact(e->event.msg.sender, 1, 0, NULL), 0);

 							gce.time = (!(e->event.msg.msgclass & GG_CLASS_OFFLINE) || e->event.msg.time > (t - timeDeviation)) ? t : e->event.msg.time;

 							gce.dwFlags = GCEF_ADDTOLOG;

 							debugLog(_T("mainthread() (%x): Conference message to room %s & id %s."), this, chat, id);

diff --git a/protocols/Gadu-Gadu/src/gg.h b/protocols/Gadu-Gadu/src/gg.h
index 308946b7c1..b0c567ada9 100644
--- a/protocols/Gadu-Gadu/src/gg.h
+++ b/protocols/Gadu-Gadu/src/gg.h
@@ -57,7 +57,6 @@
 #include <m_utils.h>

 #include <m_ignore.h>

 #include <m_clist.h>

-#include <m_clistint.h>

 #include <m_options.h>

 #include <m_userinfo.h>

 #include <m_clui.h>

diff --git a/protocols/IcqOscarJ/src/stdafx.h b/protocols/IcqOscarJ/src/stdafx.h
index b28a33ae00..f6cfeaec68 100644
--- a/protocols/IcqOscarJ/src/stdafx.h
+++ b/protocols/IcqOscarJ/src/stdafx.h
@@ -72,7 +72,6 @@
 #include <m_idle.h>

 #include <m_skin.h>

 #include <m_popup.h>

-#include <m_clistint.h>

 #include <m_cluiframes.h>

 #include <m_ignore.h>

 #include <m_icolib.h>

diff --git a/protocols/IcqOscarJ/src/stdpackets.cpp b/protocols/IcqOscarJ/src/stdpackets.cpp
index 3ea12a967b..108c482721 100644
--- a/protocols/IcqOscarJ/src/stdpackets.cpp
+++ b/protocols/IcqOscarJ/src/stdpackets.cpp
@@ -1346,7 +1346,7 @@ DWORD CIcqProto::icq_sendSMSServ(const char *szPhoneNumber, const char *szMsg)
 	strftime(szTime, sizeof(szTime), "%a, %d %b %Y %H:%M:%S GMT", gmtime(&now));

 	/* Sun, 00 Jan 0000 00:00:00 GMT */

 

-	char *szMyNick = null_strdup((char *)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)(HANDLE)NULL, 0));

+	char *szMyNick = null_strdup(_T2A(pcli->pfnGetContactDisplayName(NULL, 0)));

 	size_t nBufferSize = 1 + mir_strlen(szMyNick) + mir_strlen(szPhoneNumber) + mir_strlen(szMsg) + sizeof("<icq_sms_message><destination></destination><text></text><codepage>1252</codepage><encoding>utf8</encoding><senders_UIN>0000000000</senders_UIN><senders_name></senders_name><delivery_receipt>Yes</delivery_receipt><time>Sun, 00 Jan 0000 00:00:00 GMT</time></icq_sms_message>");

 

 	if (szBuffer = (char *)_alloca(nBufferSize)) {

diff --git a/protocols/IcqOscarJ/src/utilities.cpp b/protocols/IcqOscarJ/src/utilities.cpp
index 9071a5a8bd..3fa2e718c1 100644
--- a/protocols/IcqOscarJ/src/utilities.cpp
+++ b/protocols/IcqOscarJ/src/utilities.cpp
@@ -561,7 +561,7 @@ char* NickFromHandle(MCONTACT hContact)
 	if (hContact == INVALID_CONTACT_ID)

 		return null_strdup(Translate("<invalid>"));

 

-	return null_strdup((char *)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, hContact, 0));

+	return null_strdup((char *)pcli->pfnGetContactDisplayName(hContact, 0));

 }

 

 char* NickFromHandleUtf(MCONTACT hContact)

@@ -569,7 +569,7 @@ char* NickFromHandleUtf(MCONTACT hContact)
 	if (hContact == INVALID_CONTACT_ID)

 		return ICQTranslateUtf(LPGEN("<invalid>"));

 

-	return tchar_to_utf8((TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, hContact, GCDNF_TCHAR));

+	return tchar_to_utf8((TCHAR*)pcli->pfnGetContactDisplayName(hContact, 0));

 }

 

 char* strUID(DWORD dwUIN, char *pszUID)

diff --git a/protocols/JabberG/src/stdafx.h b/protocols/JabberG/src/stdafx.h
index d92cad8c6c..02eb632d1d 100644
--- a/protocols/JabberG/src/stdafx.h
+++ b/protocols/JabberG/src/stdafx.h
@@ -66,7 +66,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <m_button.h>

 #include <m_chat.h>

 #include <m_clist.h>

-#include <m_clistint.h>

 #include <m_cluiframes.h>

 #include <m_contacts.h>

 #include <m_database.h>

diff --git a/protocols/MRA/src/MraChat.cpp b/protocols/MRA/src/MraChat.cpp
index 758669b69b..2d63e092ce 100644
--- a/protocols/MRA/src/MraChat.cpp
+++ b/protocols/MRA/src/MraChat.cpp
@@ -37,7 +37,7 @@ INT_PTR CMraProto::MraChatSessionNew(MCONTACT hContact)
 		GCSESSION gcw = { sizeof(gcw) };

 		gcw.iType = GCW_CHATROOM;

 		gcw.pszModule = m_szModuleName;

-		gcw.ptszName = GetContactNameW(hContact);

+		gcw.ptszName = pcli->pfnGetContactDisplayName(hContact, 0);

 		gcw.ptszID = wszEMail;

 		gcw.ptszStatusbarText = _T("status bar");

 		gcw.dwItemData = (DWORD)hContact;

@@ -114,7 +114,7 @@ INT_PTR CMraProto::MraChatSessionEventSendByHandle(MCONTACT hContactChatSession,
 		MCONTACT hContactSender = MraHContactFromEmail(lpszUID, FALSE, TRUE, NULL);

 		wszUID = lpszUID;

 		if (hContactSender)

-			gce.ptszNick = GetContactNameW(hContactSender);

+			gce.ptszNick = pcli->pfnGetContactDisplayName(hContactSender, 0);

 		else

 			gce.ptszNick = wszUID;

 	}

diff --git a/protocols/MRA/src/MraProto.cpp b/protocols/MRA/src/MraProto.cpp
index 94a41372e4..ffc0918b64 100644
--- a/protocols/MRA/src/MraProto.cpp
+++ b/protocols/MRA/src/MraProto.cpp
@@ -357,7 +357,7 @@ int CMraProto::SendContacts(MCONTACT hContact, int, int nContacts, MCONTACT *hCo
 			for (int i = 0; i < nContacts; i++) {

 				if (IsContactMra(hContactsList[i]))

 					if (mraGetStringW(hContactsList[i], "e-mail", wszEmail))

-						wszData += wszEmail + ';' + GetContactNameW(hContactsList[i]) + ';';

+						wszData += wszEmail + ';' + pcli->pfnGetContactDisplayName(hContactsList[i], 0) + ';';

 			}

 

 			bSlowSend = getByte("SlowSend", MRA_DEFAULT_SLOW_SEND);

diff --git a/protocols/MRA/src/MraSelectEMail.cpp b/protocols/MRA/src/MraSelectEMail.cpp
index f956bddbec..f43beb4a9d 100644
--- a/protocols/MRA/src/MraSelectEMail.cpp
+++ b/protocols/MRA/src/MraSelectEMail.cpp
@@ -103,7 +103,7 @@ INT_PTR CALLBACK MraSelectEMailDlgProc(HWND hWndDlg, UINT message, WPARAM wParam
 				case MRA_SELECT_EMAIL_TYPE_SEND_POSTCARD:

 					{

 						CMStringA szUrl;

-						szUrl.Format("http://cards.mail.ru/event.html?rcptname=%s&rcptemail=%s", GetContactNameA(dat->hContact), szEmail);

+						szUrl.Format("http://cards.mail.ru/event.html?rcptname=%s&rcptemail=%s", pcli->pfnGetContactDisplayName(dat->hContact, 0), szEmail);

 						dat->ppro->MraMPopSessionQueueAddUrl(dat->ppro->hMPopSessionQueue, szUrl);

 					}

 					break;

diff --git a/protocols/MRA/src/Mra_functions.cpp b/protocols/MRA/src/Mra_functions.cpp
index 2ee94802f0..ef7ded50ad 100644
--- a/protocols/MRA/src/Mra_functions.cpp
+++ b/protocols/MRA/src/Mra_functions.cpp
@@ -1114,7 +1114,7 @@ INT_PTR CALLBACK SendReplyBlogStatusDlgProc(HWND hWndDlg, UINT message, WPARAM w
 

 			// reply to some user blog

 			if (dat->hContact) {

-				szBuff.Format(TranslateT("Reply to %s blog status"), GetContactNameW(dat->hContact));

+				szBuff.Format(TranslateT("Reply to %s blog status"), pcli->pfnGetContactDisplayName(dat->hContact, 0));

 				SetWindowText(hWndDlg, szBuff.c_str());

 			}

 			else SetWindowText(hWndDlg, TranslateT("Set my blog status"));

diff --git a/protocols/MRA/src/Mra_menus.cpp b/protocols/MRA/src/Mra_menus.cpp
index ce92e1781c..b6cc63c25e 100644
--- a/protocols/MRA/src/Mra_menus.cpp
+++ b/protocols/MRA/src/Mra_menus.cpp
@@ -131,7 +131,7 @@ INT_PTR CMraProto::MraSendPostcard(WPARAM wParam, LPARAM)
 			CMStringA szUrl, szEmail;

 			if (GetContactFirstEMail(wParam, FALSE, szEmail)) {

 				szEmail.MakeLower();

-				szUrl.Format("http://cards.mail.ru/event.html?rcptname=%s&rcptemail=%s", GetContactNameA((HANDLE)wParam), szEmail);

+				szUrl.Format("http://cards.mail.ru/event.html?rcptname=%S&rcptemail=%s", pcli->pfnGetContactDisplayName(wParam, 0), szEmail);

 				MraMPopSessionQueueAddUrl(hMPopSessionQueue, szUrl);

 			}

 		}

diff --git a/protocols/MRA/src/Mra_proto.cpp b/protocols/MRA/src/Mra_proto.cpp
index 3279852f6a..6b42437dbf 100644
--- a/protocols/MRA/src/Mra_proto.cpp
+++ b/protocols/MRA/src/Mra_proto.cpp
@@ -693,7 +693,7 @@ bool CMraProto::CmdUserStatus(BinBuffer &buf)
 			if (dwTemp == ID_STATUS_OFFLINE) { // was/now invisible

 				CMStringW szEmail, szBuff;

 				mraGetStringW(hContact, "e-mail", szEmail);

-				szBuff.Format(L"%s <%s> - %s", GetContactNameW(hContact), szEmail, TranslateT("invisible status changed"));

+				szBuff.Format(L"%s <%s> - %s", pcli->pfnGetContactDisplayName(hContact, 0), szEmail, TranslateT("invisible status changed"));

 				MraPopupShowFromContactW(hContact, MRA_POPUP_TYPE_INFORMATION, 0, szBuff);

 

 				MraSetContactStatus(hContact, ID_STATUS_INVISIBLE);

@@ -1261,7 +1261,7 @@ bool CMraProto::CmdClist2(BinBuffer &buf)
 							SetContactBasicInfoW(hContact, SCBIFSI_LOCK_CHANGES_EVENTS, (SCBIF_ID | SCBIF_GROUP_ID | SCBIF_SERVER_FLAG | SCBIF_STATUS),

 								dwID, dwGroupID, dwContactFlag, dwContactSeverFlags, dwTemp, NULL, &wszNick, &szCustomPhones);

 							if (wszNick.IsEmpty()) { // set the server-side nick

-								wszNick = GetContactNameW(hContact);

+								wszNick = pcli->pfnGetContactDisplayName(hContact, 0);

 								MraModifyContact(hContact, &dwID, &dwContactFlag, &dwGroupID, &szEmail, &wszNick, &szCustomPhones);

 							}

 						}

@@ -1312,7 +1312,7 @@ bool CMraProto::CmdClist2(BinBuffer &buf)
 						SetExtraIcons(hContact);

 						MraSetContactStatus(hContact, ID_STATUS_ONLINE);

 

-						CMStringW wszCustomName = GetContactNameW(hContact);

+						CMStringW wszCustomName = pcli->pfnGetContactDisplayName(hContact, 0);

 						MraAddContact(hContact, (CONTACT_FLAG_VISIBLE | CONTACT_FLAG_MULTICHAT), -1, szEmail, wszCustomName);

 					}

 					else {

diff --git a/protocols/MRA/src/Mra_svcs.cpp b/protocols/MRA/src/Mra_svcs.cpp
index 44b6dde3ac..0440cfa9eb 100644
--- a/protocols/MRA/src/Mra_svcs.cpp
+++ b/protocols/MRA/src/Mra_svcs.cpp
@@ -202,7 +202,7 @@ int CMraProto::MraDbSettingChanged(WPARAM hContact, LPARAM lParam)
 				// always store custom nick

 				CMStringW wszNick;

 				if (cws->value.type == DBVT_DELETED) {

-					wszNick = GetContactNameW(hContact);

+					wszNick = pcli->pfnGetContactDisplayName(hContact, 0);

 					db_set_ws(hContact, "CList", "MyHandle", wszNick);

 				}

 				else if (cws->value.pszVal) {

diff --git a/protocols/MRA/src/stdafx.h b/protocols/MRA/src/stdafx.h
index f5b3741957..8262f8ef69 100644
--- a/protocols/MRA/src/stdafx.h
+++ b/protocols/MRA/src/stdafx.h
@@ -25,7 +25,6 @@
 #include <m_system_cpp.h>

 #include <m_protocols.h>

 #include <m_clist.h>

-#include <m_clistint.h>

 #include <m_cluiframes.h>

 #include <m_clui.h>

 #include <m_genmenu.h>

@@ -179,9 +178,6 @@ void    InitExtraIcons();
 

 CMStringA MraGetSelfVersionString();

 

-#define GetContactNameA(Contact) (LPSTR)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)Contact, 0)

-#define GetContactNameW(Contact) (LPWSTR)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)Contact, GCDNF_UNICODE)

-

 #define SetBit(bytes, bitpos) bytes |= (1<<bitpos)

 #define GetBit(bytes, bitpos) ((bytes&(1<<bitpos))? TRUE:FALSE)

 

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>

diff --git a/protocols/MinecraftDynmap/src/stdafx.h b/protocols/MinecraftDynmap/src/stdafx.h
index 008157da25..301af3bf93 100644
--- a/protocols/MinecraftDynmap/src/stdafx.h
+++ b/protocols/MinecraftDynmap/src/stdafx.h
@@ -42,7 +42,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <m_system.h>
 #include <m_system_cpp.h>
 #include <m_chat.h>
-#include <m_clistint.h>
+#include <m_clist.h>
 #include <m_langpack.h>
 #include <m_netlib.h>
 #include <m_options.h>
diff --git a/protocols/Omegle/src/stdafx.h b/protocols/Omegle/src/stdafx.h
index aaf7530ce4..722a3520fe 100644
--- a/protocols/Omegle/src/stdafx.h
+++ b/protocols/Omegle/src/stdafx.h
@@ -42,7 +42,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <m_system.h>

 #include <m_system_cpp.h>

 #include <m_chat.h>

-#include <m_clistint.h>

+#include <m_clist.h>

 #include <m_langpack.h>

 #include <m_netlib.h>

 #include <m_options.h>

diff --git a/protocols/Sametime/src/StdAfx.h b/protocols/Sametime/src/StdAfx.h
index d1e286e1d4..c98e61d137 100644
--- a/protocols/Sametime/src/StdAfx.h
+++ b/protocols/Sametime/src/StdAfx.h
@@ -37,7 +37,6 @@ extern "C" {
 #include <mw_session.h>

 #include <mw_cipher.h>

 #include <mw_st_list.h>

-//#include <mw_util.h>

 #include <mw_service.h>

 #include <mw_channel.h>

 #include <mw_srvc_im.h>

diff --git a/protocols/Sametime/src/sametime.cpp b/protocols/Sametime/src/sametime.cpp
index a800096d0d..863430b20d 100644
--- a/protocols/Sametime/src/sametime.cpp
+++ b/protocols/Sametime/src/sametime.cpp
@@ -17,7 +17,7 @@ PLUGININFOEX pluginInfo =
 	{ 0xf1b0ba1b, 0xc91, 0x4313, { 0x85, 0xeb, 0x22, 0x50, 0x69, 0xd4, 0x4d, 0x1 } } // {F1B0BA1B-0C91-4313-85EB-225069D44D01}

 };

 

-

+CLIST_INTERFACE *pcli;

 HINSTANCE hInst;

 LIST<CSametimeProto> g_Instances(1, PtrKeySortT);

 int hLangpack;

@@ -265,6 +265,9 @@ static int sametime_proto_uninit(PROTO_INTERFACE* ppro)
 

 extern "C" int __declspec(dllexport) Load(void)

 {

+	mir_getLP(&pluginInfo);

+	mir_getCLI();

+

 	PROTOCOLDESCRIPTOR pd = { 0 };

 	pd.cbSize = sizeof(pd);

 	pd.type = PROTOTYPE_PROTOCOL;

diff --git a/protocols/Sametime/src/session_announce_win.cpp b/protocols/Sametime/src/session_announce_win.cpp
index c9fd84f4a9..8daf9494a9 100644
--- a/protocols/Sametime/src/session_announce_win.cpp
+++ b/protocols/Sametime/src/session_announce_win.cpp
@@ -46,7 +46,7 @@ INT_PTR CALLBACK SessionAnnounceDialogProc(HWND hwndDlg, UINT uMsg, WPARAM wPara
 					if (db_get_b(hContact, proto->m_szModuleName, "ChatRoom", 0) == 0

 						&& db_get_w(hContact, proto->m_szModuleName, "Status", ID_STATUS_OFFLINE) != ID_STATUS_OFFLINE) {

 						lvI.lParam = (LPARAM)hContact;

-						lvI.pszText = (TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)hContact, GCDNF_TCHAR);

+						lvI.pszText = pcli->pfnGetContactDisplayName(hContact, 0);

 						ListView_InsertItem(GetDlgItem(hwndDlg, IDC_LST_ANTO), &lvI);

 						lvI.iItem++;

 					}

diff --git a/protocols/SkypeWeb/src/stdafx.h b/protocols/SkypeWeb/src/stdafx.h
index f8dbacb6b4..c5256b9dc0 100644
--- a/protocols/SkypeWeb/src/stdafx.h
+++ b/protocols/SkypeWeb/src/stdafx.h
@@ -45,7 +45,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 #include <m_chat.h>

 #include <m_genmenu.h>

 #include <m_clc.h>

-#include <m_clistint.h>

 #include <m_string.h>

 #include <m_json.h>

 #include <m_gui.h>

diff --git a/protocols/Tlen/src/tlen.h b/protocols/Tlen/src/tlen.h
index 2c1f51c5f4..b0bf31b044 100644
--- a/protocols/Tlen/src/tlen.h
+++ b/protocols/Tlen/src/tlen.h
@@ -63,7 +63,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <m_protoint.h>

 #include <m_contacts.h>

 #include <m_clist.h>

-#include <m_clistint.h>

 #include <m_clui.h>

 #include <m_options.h>

 #include <m_userinfo.h>

diff --git a/protocols/Tlen/src/tlen_svc.cpp b/protocols/Tlen/src/tlen_svc.cpp
index 6406889bb9..fda51c425e 100644
--- a/protocols/Tlen/src/tlen_svc.cpp
+++ b/protocols/Tlen/src/tlen_svc.cpp
@@ -934,7 +934,7 @@ int TlenProtocol::TlenDbSettingChanged(WPARAM wParam, LPARAM lParam)
 				jid = dbv.pszVal;

 				if ((item=TlenListGetItemPtr(this, LIST_ROSTER, dbv.pszVal)) != NULL) {

 					if (cws->value.type == DBVT_DELETED) {

-						newNick = mir_strdup((char *) CallService(MS_CLIST_GETCONTACTDISPLAYNAME, hContact, GCDNF_NOMYHANDLE));

+						newNick = mir_strdup((char *) pcli->pfnGetContactDisplayName(hContact, GCDNF_NOMYHANDLE));

 					} else if (cws->value.pszVal != NULL) {

 						newNick = settingToChar(cws);

 					} else {

diff --git a/protocols/Tlen/src/tlen_voice.cpp b/protocols/Tlen/src/tlen_voice.cpp
index 3842268777..a08e1c1c17 100644
--- a/protocols/Tlen/src/tlen_voice.cpp
+++ b/protocols/Tlen/src/tlen_voice.cpp
@@ -934,7 +934,7 @@ static char *getDisplayName(TlenProtocol *proto, const char *id)
 		mir_snprintf(jid, _countof(jid), "%s@%s", id, dbv.pszVal);

 		db_free(&dbv);

 		if ((hContact = TlenHContactFromJID(proto, jid)) != NULL)

-			return mir_strdup((char *)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, hContact, 0));

+			return mir_strdup((char *)pcli->pfnGetContactDisplayName(hContact, 0));

 	}

 	return mir_strdup(id);

 }

diff --git a/protocols/Tox/src/stdafx.h b/protocols/Tox/src/stdafx.h
index 3a5cfafe8b..93c73cdf65 100644
--- a/protocols/Tox/src/stdafx.h
+++ b/protocols/Tox/src/stdafx.h
@@ -34,7 +34,6 @@
 #include <m_genmenu.h>

 #include <m_clc.h>

 #include <m_clist.h>

-#include <m_clistint.h>

 #include <m_gui.h>

 #include <m_folders.h>

 #include <m_assocmgr.h>

diff --git a/protocols/Twitter/src/stdafx.h b/protocols/Twitter/src/stdafx.h
index 2a2287db6b..506177b634 100644
--- a/protocols/Twitter/src/stdafx.h
+++ b/protocols/Twitter/src/stdafx.h
@@ -41,7 +41,6 @@ typedef std::basic_string<TCHAR> tstring;
 #include <m_button.h>

 #include <m_chat.h>

 #include <m_clist.h>

-#include <m_clistint.h>

 #include <m_clui.h>

 #include <m_database.h>

 #include <m_folders.h>

diff --git a/protocols/VKontakte/src/stdafx.h b/protocols/VKontakte/src/stdafx.h
index 475b19372c..0db91b86dc 100644
--- a/protocols/VKontakte/src/stdafx.h
+++ b/protocols/VKontakte/src/stdafx.h
@@ -33,7 +33,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 

 #include <m_avatars.h>

 #include <m_chat.h>

-#include <m_clistint.h>

+#include <m_clist.h>

 #include <m_database.h>

 #include <m_extraicons.h>

 #include <m_file.h>

diff --git a/protocols/WhatsApp/src/common.h b/protocols/WhatsApp/src/common.h
index c602a4fc09..abd76ecf13 100644
--- a/protocols/WhatsApp/src/common.h
+++ b/protocols/WhatsApp/src/common.h
@@ -39,7 +39,6 @@ Copyright © 2013-14 Uli Hecht
 #include <m_chat.h>

 #include <m_clc.h>

 #include <m_clist.h>

-#include <m_clistint.h>

 #include <m_clui.h>

 #include <m_database.h>

 #include <m_history.h>

diff --git a/protocols/Yahoo/src/chat.cpp b/protocols/Yahoo/src/chat.cpp
index 07c8fb6d10..e7a2ba1fe3 100644
--- a/protocols/Yahoo/src/chat.cpp
+++ b/protocols/Yahoo/src/chat.cpp
@@ -237,7 +237,7 @@ void CYahooProto::ChatEvent(const char* room, const char* who, int evt, const TC
 	TCHAR* snt = mir_a2t(who);

 

 	MCONTACT hContact = getbuddyH(who);

-	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/Yahoo/src/yahoo.h b/protocols/Yahoo/src/yahoo.h
index d90d1abcb7..89ec1af90b 100644
--- a/protocols/Yahoo/src/yahoo.h
+++ b/protocols/Yahoo/src/yahoo.h
@@ -38,7 +38,6 @@
 #include <m_netlib.h>

 #include <m_idle.h>

 #include <m_clist.h>

-#include <m_clistint.h>

 #include <m_protosvc.h>

 #include <m_protoint.h>

 #include <m_langpack.h>