diff options
| author | George Hazan <george.hazan@gmail.com> | 2015-05-31 11:46:05 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2015-05-31 11:46:05 +0000 |
| commit | 1ce3da1cca093143d9629bc46e221dd8be962e12 (patch) | |
| tree | b99d12d635a65f8c78499137137df2bd591b50be /protocols/IRCG | |
| parent | 03512ff2ed0f3d1ed6857ee85b0eb7268931ec3f (diff) | |
- 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
Diffstat (limited to 'protocols/IRCG')
| -rw-r--r-- | protocols/IRCG/src/ircproto.cpp | 6 | ||||
| -rw-r--r-- | protocols/IRCG/src/services.cpp | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/protocols/IRCG/src/ircproto.cpp b/protocols/IRCG/src/ircproto.cpp index 162876aeca..74af25ec59 100644 --- a/protocols/IRCG/src/ircproto.cpp +++ b/protocols/IRCG/src/ircproto.cpp @@ -302,7 +302,7 @@ MCONTACT __cdecl CIrcProto::AddToList(int, PROTOSEARCHRESULT* psr) if (m_iStatus == ID_STATUS_OFFLINE || m_iStatus == ID_STATUS_CONNECTING)
return 0;
- TCHAR *id = psr->id ? psr->id : psr->nick;
+ TCHAR *id = psr->id.t ? psr->id.t : psr->nick.t;
id = psr->flags & PSR_UNICODE ? mir_u2t((wchar_t*)id) : mir_a2t((char*)id);
CONTACT user = { id, NULL, NULL, true, false, false };
@@ -487,8 +487,8 @@ void __cdecl CIrcProto::AckBasicSearch(void* param) {
PROTOSEARCHRESULT psr = { sizeof(psr) };
psr.flags = PSR_TCHAR;
- psr.id = ((AckBasicSearchParam*)param)->buf;
- psr.nick = ((AckBasicSearchParam*)param)->buf;
+ psr.id.t = ((AckBasicSearchParam*)param)->buf;
+ psr.nick.t = ((AckBasicSearchParam*)param)->buf;
ProtoBroadcastAck(NULL, ACKTYPE_SEARCH, ACKRESULT_DATA, (HANDLE)1, (LPARAM)& psr);
ProtoBroadcastAck(NULL, ACKTYPE_SEARCH, ACKRESULT_SUCCESS, (HANDLE)1, 0);
delete param;
diff --git a/protocols/IRCG/src/services.cpp b/protocols/IRCG/src/services.cpp index 4dcfef8772..2d77ee5f17 100644 --- a/protocols/IRCG/src/services.cpp +++ b/protocols/IRCG/src/services.cpp @@ -744,8 +744,8 @@ int __cdecl CIrcProto::GCEventHook(WPARAM, LPARAM lParam) PROTOSEARCHRESULT psr = { 0 };
psr.cbSize = sizeof(psr);
psr.flags = PSR_TCHAR;
- psr.id = gch->ptszUID;
- psr.nick = gch->ptszUID;
+ psr.id.t = gch->ptszUID;
+ psr.nick.t = gch->ptszUID;
ADDCONTACTSTRUCT acs = { 0 };
acs.handleType = HANDLE_SEARCHRESULT;
|