summaryrefslogtreecommitdiff
path: root/plugins/MirOTR/src/utils.cpp
diff options
context:
space:
mode:
authorTobias Weimer <wishmaster51@googlemail.com>2015-10-17 14:58:29 +0000
committerTobias Weimer <wishmaster51@googlemail.com>2015-10-17 14:58:29 +0000
commit6f9167b69872efc9c6d14daa8987d0ab51a5408e (patch)
tree8234a47381bc6efd2aeb91dd7ebdabadacf6594f /plugins/MirOTR/src/utils.cpp
parent201d4c2175aab1032564893022e618098e81225d (diff)
MirOTR:
- Fixed Apply button in options - Fixed per contact policy (fixes #1070) - Other bug fixes git-svn-id: http://svn.miranda-ng.org/main/trunk@15568 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/MirOTR/src/utils.cpp')
-rw-r--r--plugins/MirOTR/src/utils.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/plugins/MirOTR/src/utils.cpp b/plugins/MirOTR/src/utils.cpp
index f61738deeb..234f21cd1c 100644
--- a/plugins/MirOTR/src/utils.cpp
+++ b/plugins/MirOTR/src/utils.cpp
@@ -118,14 +118,14 @@ char* contact_get_id(MCONTACT hContact, bool bNameOnError) {
}
}
if (!pszUniqueID && bNameOnError) {
- char *name = (char *)pcli->pfnGetContactDisplayName(hContact, 0);
- if (name) pszUniqueID = mir_strdup(name);
+ const TCHAR *name = pcli->pfnGetContactDisplayName(hContact, 0);
+ if (name) pszUniqueID = mir_t2a(name);
}
return pszUniqueID;
}
__inline const TCHAR* contact_get_nameT(MCONTACT hContact) {
- return (TCHAR*)pcli->pfnGetContactDisplayName(hContact, 0);
+ return pcli->pfnGetContactDisplayName(hContact, 0);
}
TCHAR* ProtoGetNickname(const char* proto)