diff options
| author | George Hazan <george.hazan@gmail.com> | 2015-06-30 18:59:38 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2015-06-30 18:59:38 +0000 |
| commit | 10bc9e42dfba6ed8be41199243d688c2e367dc0d (patch) | |
| tree | 891aca91eeb2feddb6c76498c4eb880689360fe6 /plugins/CmdLine/src | |
| parent | 5dac5be47f2d9af8cbceead6511ff4c0fc40bab5 (diff) | |
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
Diffstat (limited to 'plugins/CmdLine/src')
| -rw-r--r-- | plugins/CmdLine/src/mimcmd_handlers.cpp | 7 | ||||
| -rw-r--r-- | plugins/CmdLine/src/utils.cpp | 2 |
2 files changed, 5 insertions, 4 deletions
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)))
|