From 428bf0cbd77813a43094cb5c984436deff251936 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Fri, 29 Jul 2016 12:36:34 +0000 Subject: no more TCHARs git-svn-id: http://svn.miranda-ng.org/main/trunk@17143 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/Sametime/src/utils.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'protocols/Sametime/src/utils.cpp') diff --git a/protocols/Sametime/src/utils.cpp b/protocols/Sametime/src/utils.cpp index f876860fc0..7bbc3ff804 100644 --- a/protocols/Sametime/src/utils.cpp +++ b/protocols/Sametime/src/utils.cpp @@ -32,12 +32,12 @@ void CSametimeProto::RegisterPopups() wchar_t szDescr[256]; char szName[256]; - debugLog(L"CSametimeProto::RegisterPopups()"); + debugLogW(L"CSametimeProto::RegisterPopups()"); POPUPCLASS puc = { sizeof(puc) }; puc.PluginWindowProc = PopupWindowProc; puc.flags = PCF_TCHAR; - puc.ptszDescription = szDescr; + puc.pwszDescription = szDescr; puc.pszName = szName; mir_snprintf(szName, "%s_%s", m_szModuleName, "Notify"); @@ -62,7 +62,7 @@ void CSametimeProto::RegisterPopups() void CSametimeProto::UnregisterPopups() { - debugLog(L"CSametimeProto::RegisterPopups()"); + debugLogW(L"CSametimeProto::RegisterPopups()"); Popup_UnregisterClass(hPopupError); Popup_UnregisterClass(hPopupNotify); } @@ -144,10 +144,10 @@ void CSametimeProto::showPopup(guint32 code) SametimePopupEnum flag = (rcDesc->type == mwReturnCodeError ? SAMETIME_POPUP_ERROR : SAMETIME_POPUP_INFO); wchar_t buff[512]; - mir_snwprintf(buff, TranslateT("%s\n\nSametime error %S\n%s"), TranslateTS(_A2T(rcDesc->name)), rcDesc->codeString, TranslateTS(_A2T(rcDesc->description))); + mir_snwprintf(buff, TranslateT("%s\n\nSametime error %S\n%s"), TranslateW(_A2T(rcDesc->name)), rcDesc->codeString, TranslateW(_A2T(rcDesc->description))); showPopup(buff, flag); - debugLog(buff); + debugLogW(buff); g_free(rcDesc->codeString); g_free(rcDesc->name); @@ -158,17 +158,17 @@ void CSametimeProto::showPopup(guint32 code) void LogFromGLib(const gchar* log_domain, GLogLevelFlags log_level, const gchar* message, gpointer user_data) { CSametimeProto* proto = (CSametimeProto*)user_data; - proto->debugLog(_A2T(message)); + proto->debugLogW(_A2T(message)); } void CSametimeProto::RegisterGLibLogger() { - debugLog(L"CSametimeProto::RegisterGLibLogger"); + debugLogW(L"CSametimeProto::RegisterGLibLogger"); gLogHandler = g_log_set_handler(G_LOG_DOMAIN, G_LOG_LEVEL_MASK, LogFromGLib, this); } void CSametimeProto::UnRegisterGLibLogger() { - debugLog(L"CSametimeProto::UnRegisterGLibLogger"); + debugLogW(L"CSametimeProto::UnRegisterGLibLogger"); if (gLogHandler) g_log_remove_handler(G_LOG_DOMAIN, gLogHandler); } -- cgit v1.2.3