From 45bf5f51cc788cb8f19e1b8fcd5b8818dc7a2e00 Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Mon, 25 Feb 2019 21:02:11 +0300
Subject: GCEVENT::GCEF_UTF8 - flag for direct communication with utf8-encoded
 chat events (UTF16LE by default)

---
 protocols/IRCG/src/commandmonitor.cpp | 11 ++++++-----
 protocols/IRCG/src/tools.cpp          | 16 ++++++++--------
 2 files changed, 14 insertions(+), 13 deletions(-)

(limited to 'protocols/IRCG/src')

diff --git a/protocols/IRCG/src/commandmonitor.cpp b/protocols/IRCG/src/commandmonitor.cpp
index fcc1da7901..d1b42d6434 100644
--- a/protocols/IRCG/src/commandmonitor.cpp
+++ b/protocols/IRCG/src/commandmonitor.cpp
@@ -1298,11 +1298,12 @@ bool CIrcProto::OnIrc_ENDNAMES(const CIrcMessage *pmsg)
 						while (PrefixToStatus(sTemp[0]) != pwszNormal)
 							sTemp.Delete(0, 1);
 
-						GCEVENT gce = { m_szModuleName, sID, GC_EVENT_JOIN };
-						gce.ptszUID = sTemp;
-						gce.ptszNick = sTemp;
-						gce.ptszStatus = sStat;
-						gce.bIsMe = (!mir_wstrcmpi(gce.ptszNick, m_info.sNick)) ? TRUE : FALSE;
+						GCEVENT gce = { m_szModuleName, 0, GC_EVENT_JOIN };
+						gce.pszID.w = sID;
+						gce.pszUID.w = sTemp;
+						gce.pszNick.w = sTemp;
+						gce.pszStatus.w = sStat;
+						gce.bIsMe = (!mir_wstrcmpi(gce.pszNick.w, m_info.sNick)) ? TRUE : FALSE;
 						if (gce.bIsMe) {
 							char BitNr = -1;
 							switch (sTemp2[0]) {
diff --git a/protocols/IRCG/src/tools.cpp b/protocols/IRCG/src/tools.cpp
index 740a331842..02ca2c5b6d 100644
--- a/protocols/IRCG/src/tools.cpp
+++ b/protocols/IRCG/src/tools.cpp
@@ -377,21 +377,21 @@ INT_PTR CIrcProto::DoEvent(int iEvent, const wchar_t* pszWindow, const wchar_t*
 			sID = pszWindow + (CMStringW)L" - " + m_info.sNetwork;
 		else
 			sID = pszWindow;
-		gce.ptszID = (wchar_t*)sID.c_str();
+		gce.pszID.w = (wchar_t*)sID.c_str();
 	}
-	else gce.ptszID = nullptr;
+	else gce.pszID.w = nullptr;
 
-	gce.ptszStatus = pszStatus;
+	gce.pszStatus.w = pszStatus;
 	gce.dwFlags = (bAddToLog) ? GCEF_ADDTOLOG : 0;
-	gce.ptszNick = pszNick;
-	gce.ptszUID = pszNick;
+	gce.pszNick.w = pszNick;
+	gce.pszUID.w = pszNick;
 	if (iEvent == GC_EVENT_TOPIC)
-		gce.ptszUserInfo = pszUserInfo;
+		gce.pszUserInfo.w = pszUserInfo;
 	else
-		gce.ptszUserInfo = m_showAddresses ? pszUserInfo : nullptr;
+		gce.pszUserInfo.w = m_showAddresses ? pszUserInfo : nullptr;
 
 	if (!sText.IsEmpty())
-		gce.ptszText = sText.c_str();
+		gce.pszText.w = sText.c_str();
 
 	gce.dwItemData = dwItemData;
 	if (timestamp == 1)
-- 
cgit v1.2.3