diff options
| author | George Hazan <george.hazan@gmail.com> | 2013-10-03 17:27:06 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2013-10-03 17:27:06 +0000 |
| commit | a9fac2d04887b80526ab90c4c8ce45cd482e80b2 (patch) | |
| tree | 0bc62363778c6110d16016816650278a147049f7 /protocols/JabberG/src/jabber_ft.cpp | |
| parent | 9257dc8641a40437ceda38b65f4be7390e57954b (diff) | |
- filetransfer::iqid converted from string to int;
- further code cleaning
git-svn-id: http://svn.miranda-ng.org/main/trunk@6319 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/JabberG/src/jabber_ft.cpp')
| -rw-r--r-- | protocols/JabberG/src/jabber_ft.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/protocols/JabberG/src/jabber_ft.cpp b/protocols/JabberG/src/jabber_ft.cpp index 2bf763e775..811405828c 100644 --- a/protocols/JabberG/src/jabber_ft.cpp +++ b/protocols/JabberG/src/jabber_ft.cpp @@ -352,7 +352,7 @@ void CJabberProto::FtHandleSiRequest(HXML iqNode) ft->jid = mir_tstrdup(from);
ft->std.hContact = HContactFromJID(from);
ft->sid = mir_tstrdup(sid);
- ft->iqId = mir_tstrdup(szId);
+ ft->iqId = _ttoi(szId+4);
ft->type = ftType;
ft->std.totalFiles = 1;
ft->std.tszCurrentFile = mir_tstrdup(filename);
@@ -449,7 +449,7 @@ BOOL CJabberProto::FtHandleBytestreamRequest(HXML iqNode, CJabberIqInfo *pInfo) BOOL CJabberProto::FtHandleIbbRequest(HXML iqNode, BOOL bOpen)
{
- if ( !iqNode) return FALSE;
+ if (iqNode == NULL) return FALSE;
const TCHAR *id = xmlGetAttrValue(iqNode, _T("id"));
const TCHAR *from = xmlGetAttrValue(iqNode, _T("from"));
@@ -464,7 +464,7 @@ BOOL CJabberProto::FtHandleIbbRequest(HXML iqNode, BOOL bOpen) // already closed?
JABBER_LIST_ITEM *item = ListGetItemPtr(LIST_FTRECV, sid);
- if ( !item) {
+ if (item == NULL) {
m_ThreadInfo->send(
XmlNodeIq(_T("error"), id, from)
<< XCHILD(_T("error")) << XATTRI(_T("code"), 404) << XATTR(_T("type"), _T("cancel"))
|