From 400d2e50f52fe113f2130db6062fef4a970a1042 Mon Sep 17 00:00:00 2001 From: Kirill Volinsky Date: Fri, 22 Feb 2013 04:56:32 +0000 Subject: hooking loading/unloading events git-svn-id: http://svn.miranda-ng.org/main/trunk@3676 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/SecureIM/src/crypt_lists.cpp | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'plugins/SecureIM/src/crypt_lists.cpp') diff --git a/plugins/SecureIM/src/crypt_lists.cpp b/plugins/SecureIM/src/crypt_lists.cpp index 2e616a46b7..fc77021775 100644 --- a/plugins/SecureIM/src/crypt_lists.cpp +++ b/plugins/SecureIM/src/crypt_lists.cpp @@ -218,11 +218,9 @@ void getContactNameA(HANDLE hContact, LPSTR szName) { strcpy(szName,(LPCSTR)CallService(MS_CLIST_GETCONTACTDISPLAYNAME,(WPARAM)hContact,0)); } -void getContactName(HANDLE hContact, LPSTR szName) { - if ( bCoreUnicode ) - wcscpy((LPWSTR)szName,(LPWSTR)CallService(MS_CLIST_GETCONTACTDISPLAYNAME,(WPARAM)hContact,GSMDF_UNICODE)); - else - getContactNameA(hContact, szName); +void getContactName(HANDLE hContact, LPSTR szName) +{ + wcscpy((LPWSTR)szName, (LPWSTR)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)hContact, GSMDF_UNICODE)); } void getContactUinA(HANDLE hContact, LPSTR szUIN) { @@ -250,9 +248,10 @@ void getContactUinA(HANDLE hContact, LPSTR szUIN) { DBFreeVariant(&dbv_uniqueid); } -void getContactUin(HANDLE hContact, LPSTR szUIN) { +void getContactUin(HANDLE hContact, LPSTR szUIN) +{ getContactUinA(hContact, szUIN); - if ( bCoreUnicode && *szUIN ) { + if (*szUIN) { LPWSTR tmp = mir_a2u(szUIN); wcscpy((LPWSTR)szUIN, tmp); mir_free(tmp); -- cgit v1.2.3