From 191ebb9705c5a62c84ce9c442ebe689bd8123ded Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sat, 1 Aug 2015 19:37:04 +0000 Subject: fix for ansi git-svn-id: http://svn.miranda-ng.org/main/trunk@14791 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/UserInfoEx/src/ex_import/svc_ExImport.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'plugins/UserInfoEx/src') diff --git a/plugins/UserInfoEx/src/ex_import/svc_ExImport.cpp b/plugins/UserInfoEx/src/ex_import/svc_ExImport.cpp index e1c707d590..e2dd3d4ee7 100644 --- a/plugins/UserInfoEx/src/ex_import/svc_ExImport.cpp +++ b/plugins/UserInfoEx/src/ex_import/svc_ExImport.cpp @@ -46,23 +46,24 @@ static void DisplayNameToFileName(lpExImParam ExImContact, LPSTR pszFileName, WO case EXIM_GROUP: mir_strncpy(pszFileName, Translate("all Contacts"), cchFileName); return; + case EXIM_CONTACT: if (ExImContact->hContact == NULL) { mir_strncpy(pszFileName, Translate("Owner"), cchFileName); return; } - else { - disp = (LPCSTR)pcli->pfnGetContactDisplayName(ExImContact->hContact, NULL); - } + + disp = temp = mir_t2a(pcli->pfnGetContactDisplayName(ExImContact->hContact, NULL)); break; + case EXIM_SUBGROUP: temp = mir_t2a(ExImContact->ptszName); disp = temp; break; + case EXIM_ACCOUNT: PROTOACCOUNT* acc = Proto_GetAccount(ExImContact->pszName); - temp = mir_t2a(acc->tszAccountName); - disp = temp; + disp = temp = mir_t2a(acc->tszAccountName); break; } -- cgit v1.2.3