From 10bc9e42dfba6ed8be41199243d688c2e367dc0d Mon Sep 17 00:00:00 2001 From: George Hazan 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 --- plugins/CmdLine/src/mimcmd_handlers.cpp | 7 ++++--- plugins/CmdLine/src/utils.cpp | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'plugins/CmdLine/src') diff --git a/plugins/CmdLine/src/mimcmd_handlers.cpp b/plugins/CmdLine/src/mimcmd_handlers.cpp index 75a6aee74c..09ba726dbc 100644 --- a/plugins/CmdLine/src/mimcmd_handlers.cpp +++ b/plugins/CmdLine/src/mimcmd_handlers.cpp @@ -195,10 +195,11 @@ int ParseStatusParam(char *status) char *PrettyStatusMode(int status, char *buffer, int size) { - *buffer = 0; - char *data = (char *) CallService(MS_CLIST_GETSTATUSMODEDESCRIPTION, status, 0); + TCHAR *data = pcli->pfnGetStatusModeDescription(status, 0); if (data) - strncpy_s(buffer, size, data, _TRUNCATE); + strncpy_s(buffer, size, _T2A(data), _TRUNCATE); + else + *buffer = 0; return buffer; } diff --git a/plugins/CmdLine/src/utils.cpp b/plugins/CmdLine/src/utils.cpp index 9331e01ffe..7e8520d06c 100644 --- a/plugins/CmdLine/src/utils.cpp +++ b/plugins/CmdLine/src/utils.cpp @@ -246,7 +246,7 @@ MCONTACT GetContactFromID(char *szID, char *szProto) GetContactProto(hContact, cProtocol, sizeof(cProtocol)); char *szHandle = GetContactID(hContact, cProtocol); - char *tmp = (char*) CallService(MS_CLIST_GETCONTACTDISPLAYNAME, hContact, 0); + char *tmp = (char*) pcli->pfnGetContactDisplayName(hContact, 0); strncpy_s(dispName, tmp, _TRUNCATE); if ((szHandle) && ((mir_strcmpi(szHandle, szID) == 0) || (mir_strcmpi(dispName, szID) == 0)) && ((szProto == NULL) || (_stricmp(szProto, cProtocol) == 0))) -- cgit v1.2.3