From fd7a3ebacbdac24fd557b20f10282556bfd77bc9 Mon Sep 17 00:00:00 2001 From: MikalaiR Date: Sat, 19 Sep 2015 09:54:12 +0000 Subject: SendSS: fix sending to jabber; more other fixes git-svn-id: http://svn.miranda-ng.org/main/trunk@15394 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/SendScreenshotPlus/src/CSend.cpp | 2 +- plugins/SendScreenshotPlus/src/UMainForm.cpp | 21 +++++++++++---------- 2 files changed, 12 insertions(+), 11 deletions(-) (limited to 'plugins/SendScreenshotPlus') diff --git a/plugins/SendScreenshotPlus/src/CSend.cpp b/plugins/SendScreenshotPlus/src/CSend.cpp index a002707251..4c26204424 100644 --- a/plugins/SendScreenshotPlus/src/CSend.cpp +++ b/plugins/SendScreenshotPlus/src/CSend.cpp @@ -263,7 +263,7 @@ void CSend::svcSendMsgExit(const char* szMessage) m_hOnSend = HookEventObj(ME_PROTO_ACK, OnSend, this); } //start PSS_MESSAGE service - m_hSend = (HANDLE)CallContactService(m_hContact, PSS_MESSAGE, NULL, (LPARAM)m_szEventMsg); + m_hSend = (HANDLE)CallContactService(m_hContact, PSS_MESSAGE, NULL, ptrA(mir_utf8encode(m_szEventMsg))); // check we actually got an ft handle back from the protocol if (!m_hSend) { Unhook(); diff --git a/plugins/SendScreenshotPlus/src/UMainForm.cpp b/plugins/SendScreenshotPlus/src/UMainForm.cpp index b0dba2015a..517d3620be 100644 --- a/plugins/SendScreenshotPlus/src/UMainForm.cpp +++ b/plugins/SendScreenshotPlus/src/UMainForm.cpp @@ -983,18 +983,19 @@ INT_PTR TfrmMain::SaveScreenshot(FIBITMAP* dib) mir_free(path); //Generate a description according to the screenshot + TCHAR winText[1024]; - mir_tstradd(pszFileDesc, TranslateT("Screenshot ")); - if (m_opt_tabCapture == 0 && m_opt_chkClientArea) { - mir_tstradd(pszFileDesc, TranslateT("for Client area ")); - } - mir_tstradd(pszFileDesc, TranslateT("of \"")); GetDlgItemText(m_hwndTabPage, ID_edtCaption, winText, _countof(winText)); - mir_tstradd(pszFileDesc, winText); - if (m_opt_tabCapture == 1) - mir_tstradd(pszFileDesc, _T("\"")); - else - mir_tstradd(pszFileDesc, TranslateT("\" Window")); + + + CMString tszFileDesc; + + if (!m_opt_tabCapture && m_opt_chkClientArea) + tszFileDesc.Format(TranslateT("Screenshot for Client area of \"%s\""), winText); + else + tszFileDesc.Format(TranslateT("Screenshot of \"%s\" window"), winText); + + pszFileDesc = tszFileDesc.Detach(); // convert to 32Bits (make shure it is 32bit) FIBITMAP *dib_new = FIP->FI_ConvertTo32Bits(dib); -- cgit v1.2.3