summaryrefslogtreecommitdiff
path: root/protocols/JabberG
diff options
context:
space:
mode:
authorGeorge Hazan <george.hazan@gmail.com>2014-02-01 20:04:38 +0000
committerGeorge Hazan <george.hazan@gmail.com>2014-02-01 20:04:38 +0000
commit198e286b52fea238e1c6756cba07675bad8e46cc (patch)
treed1e259305bd19d0417fd0dc80be15510b3b4a797 /protocols/JabberG
parent23fee395635c2aada132eb1c5ea32f4b2d57fc57 (diff)
copy-paste problem in sources
git-svn-id: http://svn.miranda-ng.org/main/trunk@7994 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/JabberG')
-rw-r--r--protocols/JabberG/src/jabber_byte.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/protocols/JabberG/src/jabber_byte.cpp b/protocols/JabberG/src/jabber_byte.cpp
index fe376d53c3..351944ce65 100644
--- a/protocols/JabberG/src/jabber_byte.cpp
+++ b/protocols/JabberG/src/jabber_byte.cpp
@@ -171,8 +171,6 @@ void CJabberProto::ByteSendThread(JABBER_BYTE_TRANSFER *jbt)
CloseHandle(jbt->hProxyEvent);
jbt->hProxyEvent = NULL;
- mir_free(proxyJid);
-
if (jbt->state == JBT_ERROR && !bDirect) {
debugLogA("Bytestream proxy failure");
MsgPopup( pInfo->GetHContact(), TranslateT("Bytestream Proxy not available"), pInfo->GetReceiver());
@@ -565,7 +563,7 @@ int CJabberProto::ByteSendProxyParse(HANDLE hConn, JABBER_BYTE_TRANSFER *jbt, ch
item->jbt = jbt;
m_ThreadInfo->send(
- XmlNodeIq( AddIQ(&CJabberProto::IqResultStreamActivate, JABBER_IQ_TYPE_SET, jbt->streamhostJID))
+ XmlNodeIq( AddIQ(&CJabberProto::IqResultStreamActivate, JABBER_IQ_TYPE_SET, jbt->streamhostJID, 0, iqId))
<< XQUERY(JABBER_FEAT_BYTESTREAMS) << XATTR(_T("sid"), jbt->sid) << XCHILD(_T("activate"), jbt->dstJID));
WaitForSingleObject(jbt->hProxyEvent, INFINITE);