diff options
| author | George Hazan <george.hazan@gmail.com> | 2013-10-02 16:46:22 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2013-10-02 16:46:22 +0000 |
| commit | 0e130d1a06db358ed90d0ad30d633c4fad839d6e (patch) | |
| tree | 0b7052aafb152385823b5ec7d876e58e6e1f2708 /protocols/JabberG/src/jabber_thread.cpp | |
| parent | 6069deebf16c166dec9432853ce32dfaa6cc4f98 (diff) | |
code cleaning
git-svn-id: http://svn.miranda-ng.org/main/trunk@6309 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/JabberG/src/jabber_thread.cpp')
| -rw-r--r-- | protocols/JabberG/src/jabber_thread.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/protocols/JabberG/src/jabber_thread.cpp b/protocols/JabberG/src/jabber_thread.cpp index 62d73180bb..03b2b81669 100644 --- a/protocols/JabberG/src/jabber_thread.cpp +++ b/protocols/JabberG/src/jabber_thread.cpp @@ -133,7 +133,7 @@ static VOID CALLBACK JabberOfflineChatWindows(void* param) /////////////////////////////////////////////////////////////////////////////////////////
// Jabber keep-alive thread
-void CJabberProto::OnPingReply(HXML, CJabberIqInfo* pInfo)
+void CJabberProto::OnPingReply(HXML, CJabberIqInfo *pInfo)
{
if ( !pInfo)
return;
@@ -470,7 +470,7 @@ LBL_FatalError: break;
else if (nSelRes == 0 && m_bSendKeepAlive) {
if (m_ThreadInfo->jabberServerCaps & JABBER_CAPS_PING) {
- CJabberIqInfo* pInfo = m_iqManager.AddHandler(&CJabberProto::OnPingReply, JABBER_IQ_TYPE_GET, NULL, 0, -1, this);
+ CJabberIqInfo *pInfo = m_iqManager.AddHandler(&CJabberProto::OnPingReply, JABBER_IQ_TYPE_GET, NULL, 0, -1, this);
pInfo->SetTimeout(m_options.ConnectionKeepAliveTimeout);
info->send( XmlNodeIq(pInfo) << XATTR(_T("from"), m_ThreadInfo->fullJID) << XCHILDNS(_T("ping"), JABBER_FEAT_PING));
}
@@ -1891,7 +1891,7 @@ void CJabberProto::OnProcessIq(HXML node) return;
}
// RECVED: <iq type='error'> ...
- else if ( !_tcscmp(type, _T("error"))) {
+ if ( !_tcscmp(type, _T("error"))) {
Log("XXX on entry");
// Check for file transfer deny by comparing idStr with ft->iqId
LISTFOREACH(i, this, LIST_FILE)
@@ -1903,7 +1903,8 @@ void CJabberProto::OnProcessIq(HXML node) if (item->ft->hFileEvent != NULL)
SetEvent(item->ft->hFileEvent); // Simulate the termination of file server connection
}
- } }
+ }
+ }
else if ((!_tcscmp(type, _T("get")) || !_tcscmp(type, _T("set")))) {
XmlNodeIq iq(_T("error"), idStr, xmlGetAttrValue(node, _T("from")));
|