From 423be683866fd8e305457eb725d8cdbe1f297fbd Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Wed, 27 Feb 2019 12:43:20 +0300
Subject: popup code cleaning (cause we have no tchar.h)

---
 plugins/Ping/src/options.cpp |  2 +-
 plugins/Ping/src/utils.cpp   | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'plugins/Ping/src')

diff --git a/plugins/Ping/src/options.cpp b/plugins/Ping/src/options.cpp
index 71e62e2a9b..281d9b1456 100644
--- a/plugins/Ping/src/options.cpp
+++ b/plugins/Ping/src/options.cpp
@@ -37,7 +37,7 @@ static INT_PTR CALLBACK DlgProcOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA
 			EnableWindow(GetDlgItem(hwndDlg, IDC_CHK_LOGCSV), FALSE);
 		}
 
-		if (!ServiceExists(MS_POPUP_ADDPOPUPT)) {
+		if (!ServiceExists(MS_POPUP_ADDPOPUPW)) {
 			EnableWindow(GetDlgItem(hwndDlg, IDC_CHECKPOPUP), FALSE);
 			EnableWindow(GetDlgItem(hwndDlg, IDC_CHECKPOPUP2), FALSE);
 			EnableWindow(GetDlgItem(hwndDlg, IDC_CHK_BLOCK), FALSE);
diff --git a/plugins/Ping/src/utils.cpp b/plugins/Ping/src/utils.cpp
index b94fe07bce..98a3db9024 100644
--- a/plugins/Ping/src/utils.cpp
+++ b/plugins/Ping/src/utils.cpp
@@ -18,10 +18,10 @@ LRESULT CALLBACK NullWindowProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM l
 
 static INT_PTR CALLBACK sttMainThreadCallback(void *dwParam)
 {
-	POPUPDATAT* ppd = (POPUPDATAT*)dwParam;
+	POPUPDATAW* ppd = (POPUPDATAW*)dwParam;
 
-	if (ServiceExists(MS_POPUP_ADDPOPUPT))
-		PUAddPopupT(ppd);
+	if (ServiceExists(MS_POPUP_ADDPOPUPW))
+		PUAddPopupW(ppd);
 
 	free(ppd);
 	return 0;
@@ -32,15 +32,15 @@ void __stdcall	ShowPopup(wchar_t *line1, wchar_t *line2, int flags)
 	if (Miranda_IsTerminated()) return;
 
 	if (ServiceExists(MS_POPUP_ADDPOPUPCLASS)) {
-		ShowClassPopupT("pingpopups", line1, line2);
+		ShowClassPopupW("pingpopups", line1, line2);
 	}
-	else if (ServiceExists(MS_POPUP_ADDPOPUPT)) {
-		POPUPDATAT *ppd = (POPUPDATAT*)calloc(sizeof(POPUPDATAT), 1);
+	else if (ServiceExists(MS_POPUP_ADDPOPUPW)) {
+		POPUPDATAW *ppd = (POPUPDATAW*)calloc(sizeof(POPUPDATAW), 1);
 
 		ppd->lchContact = NULL;
 		ppd->lchIcon = (flags ? hIconResponding : hIconNotResponding);
-		mir_wstrncpy(ppd->lptzContactName, line1, _countof(ppd->lptzContactName));
-		mir_wstrncpy(ppd->lptzText, line2, _countof(ppd->lptzText));
+		mir_wstrncpy(ppd->lpwzContactName, line1, _countof(ppd->lpwzContactName));
+		mir_wstrncpy(ppd->lpwzText, line2, _countof(ppd->lpwzText));
 
 		ppd->colorBack = GetSysColor(COLOR_BTNFACE);
 		ppd->colorText = GetSysColor(COLOR_WINDOWTEXT);
-- 
cgit v1.2.3