From 95c0985670fefbe446908ebaef98dc2559f8d9fc Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
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/Scriver/src/chat/log.cpp   | 6 +++---
 plugins/Scriver/src/chat/tools.cpp | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'plugins/Scriver/src/chat')

diff --git a/plugins/Scriver/src/chat/log.cpp b/plugins/Scriver/src/chat/log.cpp
index 7b886c0ee3..24983d2c4b 100644
--- a/plugins/Scriver/src/chat/log.cpp
+++ b/plugins/Scriver/src/chat/log.cpp
@@ -882,9 +882,9 @@ char * Log_CreateRtfHeader(MODULEINFO * mi, SESSION_INFO* si)
 
 	// font table
 	AppendToBuffer(&buffer, &bufferEnd, &bufferAlloced, "{\\rtf1\\ansi\\deff0{\\fonttbl");
-	for (i = 0; i < OPTIONS_FONTCOUNT; i++) {
-		AppendToBuffer(&buffer, &bufferEnd, &bufferAlloced, "{\\f%u\\fnil\\fcharset%u" TCHAR_STR_PARAM ";}", i, (!forceCharset) ? aFonts[i].lf.lfCharSet : charset, aFonts[i].lf.lfFaceName);
-	}
+	for (i = 0; i < OPTIONS_FONTCOUNT; i++)
+		AppendToBuffer(&buffer, &bufferEnd, &bufferAlloced, "{\\f%u\\fnil\\fcharset%u%S;}", i, (!forceCharset) ? aFonts[i].lf.lfCharSet : charset, aFonts[i].lf.lfFaceName);
+
 	// colour table
 	AppendToBuffer(&buffer, &bufferEnd, &bufferAlloced, "}{\\colortbl ;");
 
diff --git a/plugins/Scriver/src/chat/tools.cpp b/plugins/Scriver/src/chat/tools.cpp
index 0eda0e0b52..6fa6592bcc 100644
--- a/plugins/Scriver/src/chat/tools.cpp
+++ b/plugins/Scriver/src/chat/tools.cpp
@@ -129,7 +129,7 @@ static int ShowPopup (HANDLE hContact, SESSION_INFO* si, HICON hIcon,  char* psz
 	else
 		pd.lchIcon = GetCachedIcon("chat_window");
 
-	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