From b9278adb04c824b47da7ac0ec7c1c8ef5931c888 Mon Sep 17 00:00:00 2001 From: Gluzskiy Alexandr Date: Tue, 30 Nov 2010 20:04:58 +0200 Subject: modified: messages.cpp modified: utilities.cpp modified: utilities.h --- utilities.cpp | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'utilities.cpp') diff --git a/utilities.cpp b/utilities.cpp index 66389f0..b462a23 100644 --- a/utilities.cpp +++ b/utilities.cpp @@ -438,7 +438,7 @@ void HistoryLog(HANDLE hContact, char *data, int event_type, int flags) Event.cbSize = sizeof(Event); Event.szModule = szGPGModuleName; Event.eventType = event_type; - Event.flags = flags, DBEF_UTF; + Event.flags = flags; Event.timestamp = (DWORD)time(NULL); Event.cbBlob = strlen(data)+1; Event.pBlob = (PBYTE)_strdup(data); @@ -940,6 +940,16 @@ string toUTF8(wstring str) return ustr; } +string toUTF8(string str) +{ + string ustr; + wstring tmpstr; + utf8::replace_invalid(str.begin(), str.end(), back_inserter(tmpstr)); + utf8::utf16to8(tmpstr.begin(), tmpstr.end(), back_inserter(ustr)); + return ustr; +} + + wstring toUTF16(string str) //convert as much as possible { wstring ustr; -- cgit v1.2.3