diff options
author | George Hazan <ghazan@miranda.im> | 2019-02-19 15:21:04 +0300 |
---|---|---|
committer | George Hazan <ghazan@miranda.im> | 2019-02-19 19:24:17 +0300 |
commit | fc8f2a3b692878aa581bf3fcd5c1c3c2295bbcb5 (patch) | |
tree | 17ed9d45de9d7f293578150081b5e7e4617290eb /protocols/JabberG/src/jabber_strm_mgmt.cpp | |
parent | c9e483e0fb1566d210530339d13a0e6e91260200 (diff) |
Jabber:
- XmlGetChildText / XmlGetChildInt - new handy helpers for tinyxml2;
- Unicode logging replaced with ANSI when appropriate;
- JabberErrorMsg rewritten to be more useful
Diffstat (limited to 'protocols/JabberG/src/jabber_strm_mgmt.cpp')
-rwxr-xr-x | protocols/JabberG/src/jabber_strm_mgmt.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/protocols/JabberG/src/jabber_strm_mgmt.cpp b/protocols/JabberG/src/jabber_strm_mgmt.cpp index 0d75f9e8fd..9a61f66c63 100755 --- a/protocols/JabberG/src/jabber_strm_mgmt.cpp +++ b/protocols/JabberG/src/jabber_strm_mgmt.cpp @@ -50,11 +50,14 @@ void strm_mgmt::OnProcessResumed(const TiXmlElement *node, ThreadData * /*info*/ {
if (mir_strcmp(node->Attribute("xmlns"), "urn:xmpp:sm:3"))
return;
+
auto *var = node->Attribute("previd");
if (!var)
return;
+
if (m_sStrmMgmtResumeId != var)
return; //TODO: unknown session, what we should do ?
+
var = node->Attribute("h");
if (!var)
return;
@@ -145,7 +148,7 @@ void strm_mgmt::OnProcessFailed(const TiXmlElement *node, ThreadData * info) //u if (mir_strcmp(node->Attribute("xmlns"), "urn:xmpp:sm:3"))
return;
- proto->debugLogW(L"strm_mgmt: error: Failed to resume session %s", m_sStrmMgmtResumeId.c_str());
+ proto->debugLogA("strm_mgmt: error: Failed to resume session %s", m_sStrmMgmtResumeId.c_str());
m_bStrmMgmtEnabled = false;
bSessionResumed = false;
|