From bc0b6bfb2734ce8355ddfb9b20461321c08a0b0c Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Fri, 17 Mar 2017 13:39:30 +0300
Subject: forgotten TCHAR removed
---
protocols/Gadu-Gadu/src/core.cpp | 2 +-
protocols/IRCG/src/clist.cpp | 4 ++--
protocols/JabberG/src/jabber_iq_handlers.cpp | 4 ++--
protocols/JabberG/src/jabber_notes.cpp | 4 ++--
protocols/MRA/src/Mra_functions.cpp | 2 +-
protocols/MSN/src/msn_mail.cpp | 4 ++--
protocols/SkypeWeb/src/skype_trouter.cpp | 4 ++--
protocols/Tox/src/tox_multimedia.cpp | 4 ++--
protocols/VKontakte/src/vk_feed.cpp | 4 ++--
9 files changed, 16 insertions(+), 16 deletions(-)
(limited to 'protocols')
diff --git a/protocols/Gadu-Gadu/src/core.cpp b/protocols/Gadu-Gadu/src/core.cpp
index efb64cdd15..b33cab8717 100644
--- a/protocols/Gadu-Gadu/src/core.cpp
+++ b/protocols/Gadu-Gadu/src/core.cpp
@@ -1015,7 +1015,7 @@ retry:
cle.hDbEvent = -98;
cle.lParam = (LPARAM)img;
cle.pszService = service;
- cle.pszTooltip = Translate("Incoming image");
+ cle.szTooltip.a = Translate("Incoming image");
pcli->pfnAddEvent(&cle);
ReleaseIconEx("image", FALSE);
}
diff --git a/protocols/IRCG/src/clist.cpp b/protocols/IRCG/src/clist.cpp
index 484ed0391f..1b5cf219c1 100644
--- a/protocols/IRCG/src/clist.cpp
+++ b/protocols/IRCG/src/clist.cpp
@@ -65,12 +65,12 @@ BOOL CIrcProto::CList_AddDCCChat(const CMStringW& name, const CMStringW& hostmas
CLISTEVENT cle = {};
cle.hContact = hContact;
cle.hDbEvent = -100;
- cle.flags = CLEF_TCHAR;
+ cle.flags = CLEF_UNICODE;
cle.hIcon = LoadIconEx(IDI_DCC);
mir_snprintf(szService, "%s/DblClickEvent", m_szModuleName);
cle.pszService = szService;
mir_snwprintf(szNick, TranslateT("CTCP chat request from %s"), name.c_str());
- cle.ptszTooltip = szNick;
+ cle.szTooltip.w = szNick;
cle.lParam = (LPARAM)pdci;
if (pcli->pfnGetEvent(hContact, 0))
diff --git a/protocols/JabberG/src/jabber_iq_handlers.cpp b/protocols/JabberG/src/jabber_iq_handlers.cpp
index e532340acc..932cc896db 100644
--- a/protocols/JabberG/src/jabber_iq_handlers.cpp
+++ b/protocols/JabberG/src/jabber_iq_handlers.cpp
@@ -448,11 +448,11 @@ BOOL CJabberProto::AddClistHttpAuthEvent(CJabberHttpAuthParams *pParams)
CLISTEVENT cle = {};
cle.hIcon = (HICON)LoadIconEx("openid");
- cle.flags = CLEF_PROTOCOLGLOBAL | CLEF_TCHAR;
+ cle.flags = CLEF_PROTOCOLGLOBAL | CLEF_UNICODE;
cle.hDbEvent = -99;
cle.lParam = (LPARAM)pParams;
cle.pszService = szService;
- cle.ptszTooltip = TranslateT("Http authentication request received");
+ cle.szTooltip.w = TranslateT("Http authentication request received");
pcli->pfnAddEvent(&cle);
return TRUE;
}
diff --git a/protocols/JabberG/src/jabber_notes.cpp b/protocols/JabberG/src/jabber_notes.cpp
index ca7c434ef6..733d5d9580 100644
--- a/protocols/JabberG/src/jabber_notes.cpp
+++ b/protocols/JabberG/src/jabber_notes.cpp
@@ -781,11 +781,11 @@ bool CJabberProto::OnIncomingNote(const wchar_t *szFrom, HXML hXml)
CLISTEVENT cle = {};
cle.hIcon = (HICON)LoadIconEx("notes");
- cle.flags = CLEF_PROTOCOLGLOBAL | CLEF_TCHAR;
+ cle.flags = CLEF_PROTOCOLGLOBAL | CLEF_UNICODE;
cle.hDbEvent = -99;
cle.lParam = (LPARAM)pItem;
cle.pszService = szService;
- cle.ptszTooltip = TranslateT("Incoming note");
+ cle.szTooltip.w = TranslateT("Incoming note");
pcli->pfnAddEvent(&cle);
return true;
}
diff --git a/protocols/MRA/src/Mra_functions.cpp b/protocols/MRA/src/Mra_functions.cpp
index d894a0299f..adea964be4 100644
--- a/protocols/MRA/src/Mra_functions.cpp
+++ b/protocols/MRA/src/Mra_functions.cpp
@@ -654,7 +654,7 @@ void CMraProto::MraUpdateEmailStatus(const CMStringA &pszFrom, const CMStringA &
cle.hIcon = IconLibGetIcon(gdiMenuItems[0].hIcolib);
cle.flags = (CLEF_UNICODE | CLEF_PROTOCOLGLOBAL);
cle.pszService = "";
- cle.ptszTooltip = szStatusText;
+ cle.szTooltip.w = szStatusText;
if (getByte("TrayIconNewMailClkToInbox", MRA_DEFAULT_TRAYICON_NEW_MAIL_CLK_TO_INBOX)) {
strncpy(szServiceFunction, m_szModuleName, MAX_PATH - 1);
diff --git a/protocols/MSN/src/msn_mail.cpp b/protocols/MSN/src/msn_mail.cpp
index 13a6cbcf0b..dd385c6070 100644
--- a/protocols/MSN/src/msn_mail.cpp
+++ b/protocols/MSN/src/msn_mail.cpp
@@ -292,9 +292,9 @@ void CMsnProto::sttNotificationMessage(char* msgBody, bool isInitial)
CLISTEVENT cle = {};
cle.hContact = hContact;
cle.hDbEvent = 1;
- cle.flags = CLEF_URGENT | CLEF_TCHAR;
+ cle.flags = CLEF_URGENT | CLEF_UNICODE;
cle.hIcon = Skin_LoadIcon(SKINICON_OTHER_SENDEMAIL);
- cle.ptszTooltip = tBuffer2;
+ cle.szTooltip.w = tBuffer2;
cle.pszService = buf;
pcli->pfnAddEvent(&cle);
}
diff --git a/protocols/SkypeWeb/src/skype_trouter.cpp b/protocols/SkypeWeb/src/skype_trouter.cpp
index 215f565bfe..6b0f7b8ad4 100644
--- a/protocols/SkypeWeb/src/skype_trouter.cpp
+++ b/protocols/SkypeWeb/src/skype_trouter.cpp
@@ -202,7 +202,7 @@ void CSkypeProto::OnTrouterEvent(const JSONNode &body, const JSONNode &)
SkinPlaySound("skype_inc_call");
CLISTEVENT cle = {};
- cle.flags = CLEF_TCHAR;
+ cle.flags = CLEF_UNICODE;
cle.hContact = hContact;
cle.hDbEvent = hEvent;
cle.lParam = SKYPE_DB_EVENT_TYPE_INCOMING_CALL;
@@ -212,7 +212,7 @@ void CSkypeProto::OnTrouterEvent(const JSONNode &body, const JSONNode &)
cle.pszService = service.GetBuffer();
CMStringW tooltip(FORMAT, TranslateT("Incoming call from %s"), pcli->pfnGetContactDisplayName(hContact, 0));
- cle.ptszTooltip = tooltip.GetBuffer();
+ cle.szTooltip.w = tooltip.GetBuffer();
pcli->pfnAddEvent(&cle);
ShowNotification(pcli->pfnGetContactDisplayName(hContact, 0), TranslateT("Incoming call"), hContact, SKYPE_DB_EVENT_TYPE_INCOMING_CALL);
diff --git a/protocols/Tox/src/tox_multimedia.cpp b/protocols/Tox/src/tox_multimedia.cpp
index 0cf156dace..c5c42ac79d 100644
--- a/protocols/Tox/src/tox_multimedia.cpp
+++ b/protocols/Tox/src/tox_multimedia.cpp
@@ -344,7 +344,7 @@ INT_PTR CToxProto::OnRecvAudioCall(WPARAM hContact, LPARAM lParam)
MEVENT hEvent = AddEventToDb(hContact, DB_EVENT_CALL, pre->timestamp, DBEF_UTF, (PBYTE)pre->szMessage, mir_strlen(pre->szMessage));
CLISTEVENT cle = {};
- cle.flags = CLEF_TCHAR;
+ cle.flags = CLEF_UNICODE;
cle.hContact = hContact;
cle.hDbEvent = hEvent;
cle.lParam = DB_EVENT_CALL;
@@ -352,7 +352,7 @@ INT_PTR CToxProto::OnRecvAudioCall(WPARAM hContact, LPARAM lParam)
wchar_t szTooltip[MAX_PATH];
mir_snwprintf(szTooltip, TranslateT("Incoming call from %s"), pcli->pfnGetContactDisplayName(hContact, 0));
- cle.ptszTooltip = szTooltip;
+ cle.szTooltip.w = szTooltip;
char szService[MAX_PATH];
mir_snprintf(szService, "%s/Audio/Ring", GetContactProto(hContact));
diff --git a/protocols/VKontakte/src/vk_feed.cpp b/protocols/VKontakte/src/vk_feed.cpp
index 1f1e496950..39848669f0 100644
--- a/protocols/VKontakte/src/vk_feed.cpp
+++ b/protocols/VKontakte/src/vk_feed.cpp
@@ -81,12 +81,12 @@ void CVkProto::AddCListEvent(bool bNews)
CLISTEVENT cle = {};
cle.hIcon = IcoLib_GetIconByHandle(GetIconHandle(IDI_NOTIFICATION));
cle.pszService = "SRMsg/ReadMessage";
- cle.flags = CLEF_URGENT | CLEF_TCHAR;
+ cle.flags = CLEF_URGENT | CLEF_UNICODE;
cle.hContact = hContact;
cle.hDbEvent = NULL;
wchar_t toolTip[255];
mir_snwprintf(toolTip, bNews ? TranslateT("New news") : TranslateT("New notifications"));
- cle.ptszTooltip = toolTip;
+ cle.szTooltip.w = toolTip;
pcli->pfnAddEvent(&cle);
}
--
cgit v1.2.3