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/MirandaG15/src/CAppletManager.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'plugins/MirandaG15/src/CAppletManager.cpp') diff --git a/plugins/MirandaG15/src/CAppletManager.cpp b/plugins/MirandaG15/src/CAppletManager.cpp index f6a2c7440c..37fa929a4e 100644 --- a/plugins/MirandaG15/src/CAppletManager.cpp +++ b/plugins/MirandaG15/src/CAppletManager.cpp @@ -445,7 +445,7 @@ bool CAppletManager::ActivateChatScreen(MCONTACT hContact) tstring CAppletManager::GetContactDisplayname(MCONTACT hContact,bool bShortened) { if(!bShortened || !CConfig::GetBoolSetting(NOTIFY_NICKCUTOFF)) - return (TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, hContact, GCDNF_TCHAR); + return pcli->pfnGetContactDisplayName(hContact, 0); tstring strNick = GetContactDisplayname(hContact,false); if(strNick.length() > (tstring::size_type)CConfig::GetIntSetting(NOTIFY_NICKCUTOFF_OFFSET)) @@ -1527,7 +1527,7 @@ int CAppletManager::HookStatusChanged(WPARAM wParam, LPARAM lParam) tstring strName = CAppletManager::GetContactDisplayname(Event.hContact,true); // Get status String - Event.strValue = toTstring((char *) CallService(MS_CLIST_GETSTATUSMODEDESCRIPTION, iStatus, 0)); + Event.strValue = toTstring(pcli->pfnGetStatusModeDescription(iStatus, 0)); // check if this is an irc protocol CIRCConnection *pIRCCon = CAppletManager::GetInstance()->GetIRCConnection(strProto); @@ -1688,7 +1688,7 @@ int CAppletManager::HookProtoAck(WPARAM wParam, LPARAM lParam) Event.strValue = strProto; // set the event description / summary - tstring strStatus = toTstring((char *) CallService(MS_CLIST_GETSTATUSMODEDESCRIPTION, iNewStatus, 0)); + tstring strStatus = toTstring(pcli->pfnGetStatusModeDescription(iNewStatus, 0)); Event.strDescription = _T("(") + Event.strValue + _T(") ")+ TranslateString(_T("You are now %s"),strStatus.c_str()); Event.strSummary = TranslateString(_T("Protocol status change")); -- cgit v1.2.3