From a1d6cb7bdc354be0968c6ba5ac4615e14a90eead Mon Sep 17 00:00:00 2001 From: George Hazan Date: Wed, 18 May 2016 17:21:08 +0000 Subject: these tons of code aren't needed anymore... git-svn-id: http://svn.miranda-ng.org/main/trunk@16850 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/MSN/src/msn_std.cpp | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'protocols/MSN') diff --git a/protocols/MSN/src/msn_std.cpp b/protocols/MSN/src/msn_std.cpp index 40fca05dc3..4df80b1c65 100644 --- a/protocols/MSN/src/msn_std.cpp +++ b/protocols/MSN/src/msn_std.cpp @@ -48,16 +48,13 @@ TCHAR* CMsnProto::GetContactNameT(MCONTACT hContact) if (hContact) return (TCHAR*)pcli->pfnGetContactDisplayName(WPARAM(hContact), 0); - CONTACTINFO ci = { 0 }; - ci.cbSize = sizeof(ci); - ci.dwFlag = CNF_DISPLAY | CNF_TCHAR; - ci.szProto = m_szModuleName; - if (!CallService(MS_CONTACT_GETCONTACTINFO, 0, (LPARAM)&ci)) { - if (m_DisplayNameCache) mir_free(m_DisplayNameCache); - return (TCHAR*)m_DisplayNameCache = ci.pszVal; + TCHAR *str = Contact_GetInfo(CNF_DISPLAY, NULL, m_szModuleName); + if (str != NULL) { + mir_free(m_DisplayNameCache); + return m_DisplayNameCache = str; } - else - return _T("Me"); + + return _T("Me"); } unsigned MSN_GenRandom(void) -- cgit v1.2.3