diff options
Diffstat (limited to 'protocols/AimOscar')
| -rw-r--r-- | protocols/AimOscar/src/proto.cpp | 4 | ||||
| -rw-r--r-- | protocols/AimOscar/src/server.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/protocols/AimOscar/src/proto.cpp b/protocols/AimOscar/src/proto.cpp index fef79cf78c..c6f52f054a 100644 --- a/protocols/AimOscar/src/proto.cpp +++ b/protocols/AimOscar/src/proto.cpp @@ -123,7 +123,7 @@ int CAimProto::OnModulesLoaded(WPARAM, LPARAM) MCONTACT CAimProto::AddToList(int flags, PROTOSEARCHRESULT* psr)
{
if (state != 1) return 0;
- TCHAR *id = psr->id ? psr->id : psr->nick;
+ TCHAR *id = psr->id.t ? psr->id.t : psr->nick.t;
char *sn = psr->flags & PSR_UNICODE ? mir_u2a((wchar_t*)id) : mir_strdup((char*)id);
MCONTACT hContact = contact_from_sn(sn, true, (flags & PALF_TEMPORARY) != 0);
mir_free(sn);
@@ -313,7 +313,7 @@ void __cdecl CAimProto::basic_search_ack_success(void* p) {
PROTOSEARCHRESULT psr = {0};
psr.cbSize = sizeof(psr);
- psr.id = (TCHAR*)sn;
+ psr.id.t = (TCHAR*)sn;
ProtoBroadcastAck(NULL, ACKTYPE_SEARCH, ACKRESULT_DATA, (HANDLE) 1, (LPARAM) & psr);
ProtoBroadcastAck(NULL, ACKTYPE_SEARCH, ACKRESULT_SUCCESS, (HANDLE) 1, 0);
}
diff --git a/protocols/AimOscar/src/server.cpp b/protocols/AimOscar/src/server.cpp index 2548838fa8..62d671ee71 100644 --- a/protocols/AimOscar/src/server.cpp +++ b/protocols/AimOscar/src/server.cpp @@ -1889,10 +1889,10 @@ void CAimProto::snac_email_search_results(SNAC &snac)//family 0x000A {
TLV tlv(snac.val(offset));
offset+=TLV_HEADER_SIZE;
- psr.id = (TCHAR*)tlv.dup();
+ psr.id.t = (TCHAR*)tlv.dup();
offset+=tlv.len();
ProtoBroadcastAck(NULL, ACKTYPE_SEARCH, ACKRESULT_DATA, (HANDLE) 1, (LPARAM) & psr);
- mir_free(psr.nick);
+ mir_free(psr.nick.t);
}
ProtoBroadcastAck(NULL, ACKTYPE_SEARCH, ACKRESULT_SUCCESS, (HANDLE) 1, 0);
}
|