summaryrefslogtreecommitdiff
path: root/plugins/UserInfoEx/src/ex_import
diff options
context:
space:
mode:
authorGeorge Hazan <george.hazan@gmail.com>2015-08-01 19:37:04 +0000
committerGeorge Hazan <george.hazan@gmail.com>2015-08-01 19:37:04 +0000
commit191ebb9705c5a62c84ce9c442ebe689bd8123ded (patch)
tree562d79b4a798ea74f9969e5bdc3a6c816601449e /plugins/UserInfoEx/src/ex_import
parent0baf5ace93f6d77ab348728bc176e17f9f5163fa (diff)
fix for ansi
git-svn-id: http://svn.miranda-ng.org/main/trunk@14791 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/UserInfoEx/src/ex_import')
-rw-r--r--plugins/UserInfoEx/src/ex_import/svc_ExImport.cpp11
1 files changed, 6 insertions, 5 deletions
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;
}