From 2f261839b60692e33d0e160344d0d636d49c90ba Mon Sep 17 00:00:00 2001 From: George Hazan Date: Wed, 27 Jul 2016 14:23:31 +0000 Subject: less TCHARs git-svn-id: http://svn.miranda-ng.org/main/trunk@17138 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/JabberG/src/jabber_icolib.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'protocols/JabberG/src/jabber_icolib.cpp') diff --git a/protocols/JabberG/src/jabber_icolib.cpp b/protocols/JabberG/src/jabber_icolib.cpp index 6d85d38886..64aae7a25b 100644 --- a/protocols/JabberG/src/jabber_icolib.cpp +++ b/protocols/JabberG/src/jabber_icolib.cpp @@ -307,7 +307,7 @@ int CJabberProto::LoadAdvancedIcons(int iID) int first = -1; HICON empty = Skin_LoadIcon(SKINICON_OTHER_MIRANDA); - mir_sntprintf(Group, LPGENW("Status icons")L"/%s/%S %s", m_tszUserName, proto, TranslateT("transport")); + mir_snwprintf(Group, LPGENW("Status icons")L"/%s/%S %s", m_tszUserName, proto, TranslateT("transport")); mir_snprintf(defFile, "proto_%s.dll", proto); if (!hAdvancedStatusIcon) hAdvancedStatusIcon = (HIMAGELIST)CallService(MS_CLIST_GETICONSIMAGELIST, 0, 0); @@ -389,7 +389,7 @@ INT_PTR __cdecl CJabberProto::JGetAdvancedStatusIcon(WPARAM hContact, LPARAM) if (!getByte(hContact, "IsTransported", 0)) return -1; - int iID = GetTransportProtoID(ptrT(getTStringA(hContact, "Transport"))); + int iID = GetTransportProtoID(ptrW(getTStringA(hContact, "Transport"))); if (iID < 0) return -1; @@ -431,7 +431,7 @@ BOOL CJabberProto::DBCheckIsTransportedContact(const wchar_t *jid, MCONTACT hCon } if (m_lstTransports.getIndex(domain) == -1 && isAgent) { - m_lstTransports.insert(mir_tstrdup(domain)); + m_lstTransports.insert(mir_wstrdup(domain)); setByte(hContact, "IsTransport", 1); } @@ -445,7 +445,7 @@ BOOL CJabberProto::DBCheckIsTransportedContact(const wchar_t *jid, MCONTACT hCon void CJabberProto::CheckAllContactsAreTransported() { for (MCONTACT hContact = db_find_first(m_szModuleName); hContact; hContact = db_find_next(hContact, m_szModuleName)) { - ptrT jid(getTStringA(hContact, "jid")); + ptrW jid(getTStringA(hContact, "jid")); if (jid) DBCheckIsTransportedContact(jid, hContact); } -- cgit v1.2.3