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/NewXstatusNotify/src/main.cpp    |  2 +-
 plugins/NewXstatusNotify/src/options.cpp |  2 +-
 plugins/NewXstatusNotify/src/popup.cpp   | 10 +++++-----
 3 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'plugins/NewXstatusNotify/src')

diff --git a/plugins/NewXstatusNotify/src/main.cpp b/plugins/NewXstatusNotify/src/main.cpp
index b63428ef8a..c173aa2f79 100644
--- a/plugins/NewXstatusNotify/src/main.cpp
+++ b/plugins/NewXstatusNotify/src/main.cpp
@@ -1084,7 +1084,7 @@ void InitMainMenuItem()
 	CMenuItem mi(&g_plugin);
 	SET_UID(mi, 0x22b7b4db, 0xa9a1, 0x4d43, 0x88, 0x80, 0x4c, 0x23, 0x20, 0x31, 0xc6, 0xa0);
 	mi.flags = CMIF_UNICODE;
-	if (ServiceExists(MS_POPUP_ADDPOPUPT))
+	if (ServiceExists(MS_POPUP_ADDPOPUPW))
 		mi.root = g_plugin.addRootMenu(MO_MAIN, LPGENW("Popups"), 0);
 	mi.pszService = MS_STATUSCHANGE_MENUCOMMAND;
 	hEnableDisableMenu = Menu_AddMainMenuItem(&mi);
diff --git a/plugins/NewXstatusNotify/src/options.cpp b/plugins/NewXstatusNotify/src/options.cpp
index 6f59c4fd28..178b1b9301 100644
--- a/plugins/NewXstatusNotify/src/options.cpp
+++ b/plugins/NewXstatusNotify/src/options.cpp
@@ -1197,7 +1197,7 @@ int OptionsInitialize(WPARAM wParam, LPARAM)
 	odp.pfnDlgProc = DlgProcFiltering;
 	g_plugin.addOptions(wParam, &odp);
 
-	if (ServiceExists(MS_POPUP_ADDPOPUPT)) {
+	if (ServiceExists(MS_POPUP_ADDPOPUPW)) {
 		odp.szTitle.a = LPGEN("Status Notify");
 		odp.szGroup.a = LPGEN("Popups");
 		odp.szTab.a = LPGEN("General");
diff --git a/plugins/NewXstatusNotify/src/popup.cpp b/plugins/NewXstatusNotify/src/popup.cpp
index 564183a572..32c9758b01 100644
--- a/plugins/NewXstatusNotify/src/popup.cpp
+++ b/plugins/NewXstatusNotify/src/popup.cpp
@@ -23,7 +23,7 @@
 
 void ShowChangePopup(MCONTACT hContact, HICON hIcon, WORD newStatus, const wchar_t *stzText, PLUGINDATA *pdp)
 {
-	POPUPDATAT ppd = { 0 };
+	POPUPDATAW ppd = { 0 };
 	ppd.lchContact = hContact;
 	ppd.lchIcon = hIcon;
 	CMStringW buf(Clist_GetContactDisplayName(hContact));
@@ -34,8 +34,8 @@ void ShowChangePopup(MCONTACT hContact, HICON hIcon, WORD newStatus, const wchar
 		if (tszGroup)
 			buf.AppendFormat(L" (%s)", tszGroup);
 	}
-	wcsncpy_s(ppd.lptzContactName, buf, _TRUNCATE);
-	wcsncpy_s(ppd.lptzText, stzText, _TRUNCATE);
+	wcsncpy_s(ppd.lpwzContactName, buf, _TRUNCATE);
+	wcsncpy_s(ppd.lpwzText, stzText, _TRUNCATE);
 
 	switch (opt.Colors) {
 	case POPUP_COLOR_OWN:
@@ -55,7 +55,7 @@ void ShowChangePopup(MCONTACT hContact, HICON hIcon, WORD newStatus, const wchar
 
 	ppd.PluginData = pdp;
 	ppd.iSeconds = opt.PopupTimeout;
-	PUAddPopupT(&ppd);
+	PUAddPopupW(&ppd);
 }
 
 static int AwayMsgHook(WPARAM, LPARAM lParam, LPARAM pObj)
@@ -88,7 +88,7 @@ static int AwayMsgHook(WPARAM, LPARAM lParam, LPARAM pObj)
 	else
 		wcsncpy(stzText, tszStatus, _countof(stzText));
 	SendMessage(pdp->hWnd, WM_SETREDRAW, FALSE, 0);
-	PUChangeTextT(pdp->hWnd, stzText);
+	PUChangeTextW(pdp->hWnd, stzText);
 	SendMessage(pdp->hWnd, WM_SETREDRAW, TRUE, 0);
 	return 0;
 }
-- 
cgit v1.2.3