From fc061c08605be248f487ecd156c146d00f42076a Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sun, 20 Feb 2022 17:23:52 +0300 Subject: Jabber: support for description field in the incoming OOB file transfers --- protocols/JabberG/src/jabber_thread.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'protocols/JabberG/src') diff --git a/protocols/JabberG/src/jabber_thread.cpp b/protocols/JabberG/src/jabber_thread.cpp index 5f26bc929e..862db55b30 100755 --- a/protocols/JabberG/src/jabber_thread.cpp +++ b/protocols/JabberG/src/jabber_thread.cpp @@ -1311,12 +1311,17 @@ void CJabberProto::OnProcessMessage(const TiXmlElement *node, ThreadData *info) msgTime = JabberIsoToUnixTime(ptszTimeStamp); } else if (!mir_strcmp(pszXmlns, JABBER_FEAT_OOB2)) { - auto *url = XmlGetChildText(xNode, "url"); - if (url != nullptr) { + if (auto *url = XmlGetChildText(xNode, "url")) { if (!szMessage.IsEmpty()) szMessage.Append("\r\n"); szMessage.Append(url); } + + if (auto *descr = XmlGetChildText(xNode, "description")) { + if (!szMessage.IsEmpty()) + szMessage.Append("\r\n"); + szMessage.AppendFormat("%s: %s", TranslateU("Description"), descr); + } } else if (!mir_strcmp(pszXmlns, JABBER_FEAT_MUC_USER)) { auto *inviteNode = XmlFirstChild(xNode, "invite"); -- cgit v1.2.3