From 8f69e474391d3cc97d6bf0b2a355a233c1c64a3f Mon Sep 17 00:00:00 2001 From: Gluzskiy Alexandr Date: Tue, 16 Oct 2012 09:03:10 +0300 Subject: merge with miranda ng main repo --- src/utilities.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'src/utilities.cpp') diff --git a/src/utilities.cpp b/src/utilities.cpp index aae4d87..a734ec0 100755 --- a/src/utilities.cpp +++ b/src/utilities.cpp @@ -740,7 +740,12 @@ static JABBER_HANDLER_FUNC SendHandler(IJabberInterface *ji, HXML node, void *pU } p1+=2; wstring::size_type p2 = data.find(_T("-----END PGP MESSAGE-----")); - HXML encrypted_data = xi.addChild(node, _T("x"), data.substr(p1, p2-p1).c_str()); + wstring data2 = data.substr(p1, p2-p1); + for(std::wstring::size_type i = data2.find(_T("\r")); i != std::wstring::npos; i = data2.find(_T("\r"), i+1)) + data2.erase(i, 1); + for(std::wstring::size_type i = data2.find(_T("\n")); i != std::wstring::npos; i = data2.find(_T("\n"), i+1)) + data2.erase(i, 1); + HXML encrypted_data = xi.addChild(node, _T("x"), data2.c_str()); xi.addAttr(encrypted_data, _T("xmlns"), _T("jabber:x:encrypted")); return FALSE; } -- cgit v1.2.3