From 1ce3da1cca093143d9629bc46e221dd8be962e12 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sun, 31 May 2015 11:46:05 +0000 Subject: - MAllStrings: a handy union to hold an incoming string parameter of any type; - FNAMECHAR: atavism extincted; - PROTOSEARCHRESULT: structure prepared to use results of any type, including utf git-svn-id: http://svn.miranda-ng.org/main/trunk@13932 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/JabberG/src/jabber_chat.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'protocols/JabberG/src/jabber_chat.cpp') diff --git a/protocols/JabberG/src/jabber_chat.cpp b/protocols/JabberG/src/jabber_chat.cpp index 349853f05a..4ac3010bea 100644 --- a/protocols/JabberG/src/jabber_chat.cpp +++ b/protocols/JabberG/src/jabber_chat.cpp @@ -1208,18 +1208,18 @@ static void sttNickListHook(CJabberProto *ppro, JABBER_LIST_ITEM *item, GCHOOK* case IDM_RJID_ADD: if (him->m_tszRealJid && *him->m_tszRealJid) { - PROTOSEARCHRESULT jsr = { 0 }; - jsr.cbSize = sizeof(jsr); - jsr.flags = PSR_TCHAR; - jsr.id = NEWTSTR_ALLOCA(him->m_tszRealJid); - if (TCHAR *tmp = _tcschr(jsr.id, _T('/'))) + PROTOSEARCHRESULT psr = { 0 }; + psr.cbSize = sizeof(psr); + psr.flags = PSR_TCHAR; + psr.id.t = NEWTSTR_ALLOCA(him->m_tszRealJid); + if (TCHAR *tmp = _tcschr(psr.id.t, _T('/'))) *tmp = 0; - jsr.nick = jsr.id; + psr.nick.t = psr.id.t; ADDCONTACTSTRUCT acs = { 0 }; acs.handleType = HANDLE_SEARCHRESULT; acs.szProto = ppro->m_szModuleName; - acs.psr = &jsr; + acs.psr = &psr; CallService(MS_ADDCONTACT_SHOW, (WPARAM)CallService(MS_CLUI_GETHWND, 0, 0), (LPARAM)&acs); } break; -- cgit v1.2.3