From 504307b184517248795d3ae4301969bfa93a050a Mon Sep 17 00:00:00 2001 From: George Hazan Date: Wed, 18 May 2016 12:31:56 +0000 Subject: unused proprietary services removed from UserInfoEx git-svn-id: http://svn.miranda-ng.org/main/trunk@16848 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- .../UserInfoEx/src/ex_import/classExImContactBase.cpp | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) (limited to 'plugins/UserInfoEx/src/ex_import/classExImContactBase.cpp') diff --git a/plugins/UserInfoEx/src/ex_import/classExImContactBase.cpp b/plugins/UserInfoEx/src/ex_import/classExImContactBase.cpp index 6963b75b55..102fe49b42 100644 --- a/plugins/UserInfoEx/src/ex_import/classExImContactBase.cpp +++ b/plugins/UserInfoEx/src/ex_import/classExImContactBase.cpp @@ -290,17 +290,14 @@ void CExImContactBase::toIni(FILE* file, int modCount) strncpy_s(name, "(UNKNOWN)", _TRUNCATE); } else { - // Proto loadet - GetContactName(hContact,pszProto,0) + // Proto loaded - GetContactName(hContact,pszProto,0) LPSTR pszCI = NULL; - CONTACTINFO ci; - memset(&ci, 0, sizeof(ci)); - - ci.cbSize = sizeof(ci); - ci.hContact = _hContact; - ci.szProto = _pszProto; - ci.dwFlag = CNF_DISPLAY; - - if (!GetContactInfo(NULL, (LPARAM) &ci)) { + CONTACTINFO ci = {}; + ci.cbSize = sizeof(ci); + ci.hContact = _hContact; + ci.szProto = _pszProto; + ci.dwFlag = CNF_DISPLAY; + if (!CallService(MS_CONTACT_GETCONTACTINFO, NULL, (LPARAM)&ci)) { // CNF_DISPLAY always returns a string type pszCI = (LPSTR)ci.pszVal; } @@ -312,7 +309,7 @@ void CExImContactBase::toIni(FILE* file, int modCount) mir_free(pszCI); mir_free(pszUID); - } // end else (Proto loadet) + } // end else (Proto loaded) // it is not the best solution (but still works if only basic modules export) - need rework if (modCount > 3) -- cgit v1.2.3