- 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

1 files changed, 10 insertions, 10 deletions

diff --git a/protocols/JabberG/src/jabber_proto.cpp b/protocols/JabberG/src/jabber_proto.cpp
index 6fcc49e023..ee87d26b89 100644
--- a/protocols/JabberG/src/jabber_proto.cpp
+++ b/protocols/JabberG/src/jabber_proto.cpp
@@ -332,10 +332,10 @@ MCONTACT CJabberProto::AddToListByJID(const TCHAR *newJid, DWORD flags)
 

 MCONTACT CJabberProto::AddToList(int flags, PROTOSEARCHRESULT* psr)

 {

-	if (psr->cbSize != sizeof(PROTOSEARCHRESULT) && psr->id == NULL)

+	if (psr->cbSize != sizeof(PROTOSEARCHRESULT) && psr->id.t == NULL)

 		return NULL;

 

-	return AddToListByJID(psr->id, flags);

+	return AddToListByJID(psr->id.t, flags);

 }

 

 MCONTACT __cdecl CJabberProto::AddToListByEvent(int flags, int /*iContact*/, MEVENT hDbEvent)

@@ -681,15 +681,15 @@ void __cdecl CJabberProto::BasicSearchThread(JABBER_SEARCH_BASIC *jsb)
 {

 	Sleep(100);

 

-	PROTOSEARCHRESULT jsr = { 0 };

-	jsr.cbSize = sizeof(jsr);

-	jsr.flags = PSR_TCHAR;

-	jsr.nick = jsb->jid;

-	jsr.firstName = _T("");

-	jsr.lastName = _T("");

-	jsr.id = jsb->jid;

+	PROTOSEARCHRESULT psr = { 0 };

+	psr.cbSize = sizeof(psr);

+	psr.flags = PSR_TCHAR;

+	psr.nick.t = jsb->jid;

+	psr.firstName.t = _T("");

+	psr.lastName.t = _T("");

+	psr.id.t = jsb->jid;

 

-	ProtoBroadcastAck(NULL, ACKTYPE_SEARCH, ACKRESULT_DATA, (HANDLE)jsb->hSearch, (LPARAM)&jsr);

+	ProtoBroadcastAck(NULL, ACKTYPE_SEARCH, ACKRESULT_DATA, (HANDLE)jsb->hSearch, (LPARAM)&psr);

 	ProtoBroadcastAck(NULL, ACKTYPE_SEARCH, ACKRESULT_SUCCESS, (HANDLE)jsb->hSearch, 0);

 	mir_free(jsb);

 }