From 7ede7b7528dfb2b4fde85de0753ef10b0167ae8e Mon Sep 17 00:00:00 2001 From: Tobias Weimer Date: Thu, 9 Oct 2014 22:16:38 +0000 Subject: IEView: -Fixed copying smileys from message log (fixes #345) -version bump git-svn-id: http://svn.miranda-ng.org/main/trunk@10750 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/IEView/src/TextToken.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'plugins/IEView/src/TextToken.cpp') diff --git a/plugins/IEView/src/TextToken.cpp b/plugins/IEView/src/TextToken.cpp index a7b4fb85bf..7dc8acbc73 100644 --- a/plugins/IEView/src/TextToken.cpp +++ b/plugins/IEView/src/TextToken.cpp @@ -357,18 +357,18 @@ TextToken* TextToken::tokenizeLinks(const wchar_t *text) TextToken* TextToken::tokenizeSmileys(MCONTACT hContact, const char *proto, const wchar_t *text, bool isSent) { TextToken *firstToken = NULL, *lastToken = NULL; - SMADD_BATCHPARSE2 sp; - SMADD_BATCHPARSERES *spRes; int l = (int)wcslen(text); if (!Options::isSmileyAdd()) { return new TextToken(TEXT, text, l); } + + SMADD_BATCHPARSE2 sp; sp.cbSize = sizeof(sp); sp.Protocolname = proto; sp.flag = SAFL_PATH | SAFL_UNICODE | (isSent ? SAFL_OUTGOING : 0); sp.wstr = (wchar_t *)text; sp.hContact = hContact; - spRes = (SMADD_BATCHPARSERES *)CallService(MS_SMILEYADD_BATCHPARSE, 0, (LPARAM)&sp); + SMADD_BATCHPARSERES *spRes = (SMADD_BATCHPARSERES *)CallService(MS_SMILEYADD_BATCHPARSE, 0, (LPARAM)&sp); int last_pos = 0; if (spRes != NULL) { for (int i = 0; i < (int)sp.numSmileys; i++) { @@ -637,16 +637,16 @@ void TextToken::toString(wchar_t **str, int *sizeAlloced) Utils::appendText(str, sizeAlloced, L"\ - %s", - eText, wlink, eText); + ", + eText, wlink); } else { - Utils::appendText(str, sizeAlloced, L"\"%s\"%s", wlink, eText, eText, eText); + Utils::appendText(str, sizeAlloced, L"\"%s\"", wlink, eText, eText); } break; case MATH: eText = htmlEncode(wtext); - Utils::appendText(str, sizeAlloced, L"\"%s\"%s", wlink, eText, eText); + Utils::appendText(str, sizeAlloced, L"\"%s\"", wlink, eText, eText); break; case BBCODE: if (!end) { -- cgit v1.2.3