From 95c0985670fefbe446908ebaef98dc2559f8d9fc Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sat, 2 Mar 2013 12:37:59 +0000 Subject: rest of TCHAR_STR_PARAM replaced git-svn-id: http://svn.miranda-ng.org/main/trunk@3831 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/TabSRMM/src/chat/log.cpp | 2 +- plugins/TabSRMM/src/chat/tools.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'plugins/TabSRMM/src') diff --git a/plugins/TabSRMM/src/chat/log.cpp b/plugins/TabSRMM/src/chat/log.cpp index a6cfde546c..57b6fadff8 100644 --- a/plugins/TabSRMM/src/chat/log.cpp +++ b/plugins/TabSRMM/src/chat/log.cpp @@ -1200,7 +1200,7 @@ char * Log_CreateRtfHeader(MODULEINFO * mi) // font table Log_Append(&buffer, &bufferEnd, &bufferAlloced, "{\\rtf1\\ansi\\deff0{\\fonttbl"); for (i=0; i < OPTIONS_FONTCOUNT ; i++) - Log_Append(&buffer, &bufferEnd, &bufferAlloced, "{\\f%u\\fnil\\fcharset%u" TCHAR_STR_PARAM ";}", i, aFonts[i].lf.lfCharSet, aFonts[i].lf.lfFaceName); + Log_Append(&buffer, &bufferEnd, &bufferAlloced, "{\\f%u\\fnil\\fcharset%u%S;}", i, aFonts[i].lf.lfCharSet, aFonts[i].lf.lfFaceName); // colour table Log_Append(&buffer, &bufferEnd, &bufferAlloced, "}{\\colortbl ;"); diff --git a/plugins/TabSRMM/src/chat/tools.cpp b/plugins/TabSRMM/src/chat/tools.cpp index c2e0644c95..dfe7071225 100644 --- a/plugins/TabSRMM/src/chat/tools.cpp +++ b/plugins/TabSRMM/src/chat/tools.cpp @@ -217,7 +217,7 @@ static int ShowPopup(HANDLE hContact, SESSION_INFO* si, HICON hIcon, char* pszP else pd.lchIcon = LoadIconEx(IDI_CHANMGR, "window", 0, 0); - mir_sntprintf(pd.lptzContactName, MAX_CONTACTNAME - 1, _T(TCHAR_STR_PARAM) _T(" - %s"), + mir_sntprintf(pd.lptzContactName, MAX_CONTACTNAME - 1, _T("%S - %s"), pszProtoName, CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)hContact, GCDNF_TCHAR)); lstrcpyn(pd.lptzText, TranslateTS(szBuf), MAX_SECONDLINE - 1); pd.iSeconds = g_Settings.iPopupTimeout; -- cgit v1.2.3