summaryrefslogtreecommitdiff
path: root/protocols/ICQCorp
diff options
context:
space:
mode:
authorGeorge Hazan <george.hazan@gmail.com>2015-05-31 15:35:16 +0000
committerGeorge Hazan <george.hazan@gmail.com>2015-05-31 15:35:16 +0000
commit85e27141c915d057deeb4be6c4bc81d387c39be6 (patch)
tree8530d232b086f5fb30dd11f21426c0ad601ed65b /protocols/ICQCorp
parent9ac20243efe27f58501c59060a4f22c37104c0e3 (diff)
compilation fix
git-svn-id: http://svn.miranda-ng.org/main/trunk@13938 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/ICQCorp')
-rw-r--r--protocols/ICQCorp/src/protocol.cpp33
1 files changed, 14 insertions, 19 deletions
diff --git a/protocols/ICQCorp/src/protocol.cpp b/protocols/ICQCorp/src/protocol.cpp
index 9dadf66044..5b3d7e560a 100644
--- a/protocols/ICQCorp/src/protocol.cpp
+++ b/protocols/ICQCorp/src/protocol.cpp
@@ -681,24 +681,18 @@ unsigned short ICQ::processUdpPacket(Packet &packet)
firstName = NULL;
lastName = NULL;
email = NULL;
-
- packet >> checkUin
- >> alias
- >> firstName
- >> lastName
- >> email
- >> auth;
-
- ICQSEARCHRESULT isr;
-
- isr.hdr.cbSize = sizeof(isr);
- isr.hdr.nick = alias;
- isr.hdr.firstName = firstName;
- isr.hdr.lastName = lastName;
- isr.hdr.email = email;
- isr.uin = checkUin;
- isr.auth = auth;
- ProtoBroadcastAck(protoName, NULL, ACKTYPE_SEARCH, ACKRESULT_DATA, (HANDLE)1, (LPARAM)&isr);
+ packet >> checkUin >> alias >> firstName >> lastName >> email >> auth;
+ {
+ ICQSEARCHRESULT psr = { 0 };
+ psr.hdr.cbSize = sizeof(psr);
+ psr.hdr.nick.a = alias;
+ psr.hdr.firstName.a = firstName;
+ psr.hdr.lastName.a = lastName;
+ psr.hdr.email.a = email;
+ psr.uin = checkUin;
+ psr.auth = auth;
+ ProtoBroadcastAck(protoName, NULL, ACKTYPE_SEARCH, ACKRESULT_DATA, (HANDLE)1, (LPARAM)&psr);
+ }
delete [] alias;
delete [] firstName;
@@ -1457,7 +1451,8 @@ bool ICQ::openConnection(TCPSocket &socket)
ICQEvent *ICQ::sendTCP(ICQUser *u, unsigned short cmd, char *cmdStr, char *m)
{
- if (!u->socket.connected() && !openConnection(u->socket)) return NULL;
+ if (!u->socket.connected() && !openConnection(u->socket))
+ return NULL;
unsigned int status;
if (accept)