From 7101bc5c14b738fb783dfd5a7f6f7d11762cbe2a Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Tue, 26 May 2015 22:32:12 +0000
Subject: - crazy hack for the srmm icons sort order fixed; - unused parameter
 removed

git-svn-id: http://svn.miranda-ng.org/main/trunk@13854 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/TabSRMM/src/msgdialog.cpp | 55 ++++++++++++++++++---------------------
 1 file changed, 26 insertions(+), 29 deletions(-)

(limited to 'plugins/TabSRMM/src/msgdialog.cpp')

diff --git a/plugins/TabSRMM/src/msgdialog.cpp b/plugins/TabSRMM/src/msgdialog.cpp
index 6ff33acddf..559023dd4b 100644
--- a/plugins/TabSRMM/src/msgdialog.cpp
+++ b/plugins/TabSRMM/src/msgdialog.cpp
@@ -2664,40 +2664,37 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP
 				if (final_sendformat)
 					DoRtfToTags(dat, decoded, SIZEOF(rtfDefColors), rtfDefColors);
 				decoded.TrimRight();
-				int bufSize = WideCharToMultiByte(dat->codePage, 0, decoded, -1, dat->sendBuffer, 0, 0, 0);
+
+				T2Utf utfResult(decoded);
+				size_t memRequired = mir_strlen(utfResult) + 1;
+
+				// try to detect RTL
+				HWND hwndEdit = GetDlgItem(hwndDlg, IDC_MESSAGE);
+				SendMessage(hwndEdit, WM_SETREDRAW, FALSE, 0);
+
+				PARAFORMAT2 pf2;
+				memset(&pf2, 0, sizeof(PARAFORMAT2));
+				pf2.cbSize = sizeof(pf2);
+				pf2.dwMask = PFM_RTLPARA;
+				SendMessage(hwndEdit, EM_SETSEL, 0, -1);
+				SendMessage(hwndEdit, EM_GETPARAFORMAT, 0, (LPARAM)&pf2);
 
 				int flags = 0;
-				size_t memRequired;
-				{
-					T2Utf utfResult(decoded);
-					memRequired = mir_strlen(utfResult) + 1;
-
-					// try to detect RTL
-					HWND hwndEdit = GetDlgItem(hwndDlg, IDC_MESSAGE);
-					SendMessage(hwndEdit, WM_SETREDRAW, FALSE, 0);
-
-					PARAFORMAT2 pf2;
-					memset(&pf2, 0, sizeof(PARAFORMAT2));
-					pf2.cbSize = sizeof(pf2);
-					pf2.dwMask = PFM_RTLPARA;
-					SendMessage(hwndEdit, EM_SETSEL, 0, -1);
-					SendMessage(hwndEdit, EM_GETPARAFORMAT, 0, (LPARAM)&pf2);
-					if (pf2.wEffects & PFE_RTLPARA)
-						if (SendQueue::RTL_Detect(decoded))
-							flags |= PREF_RTL;
-
-					SendMessage(hwndEdit, WM_SETREDRAW, TRUE, 0);
-					SendMessage(hwndEdit, EM_SETSEL, -1, -1);
-					InvalidateRect(hwndEdit, NULL, FALSE);
-
-					if (memRequired > dat->iSendBufferSize) {
-						dat->sendBuffer = (char *)mir_realloc(dat->sendBuffer, memRequired);
-						dat->iSendBufferSize = memRequired;
-					}
+				if (pf2.wEffects & PFE_RTLPARA)
+					if (SendQueue::RTL_Detect(decoded))
+						flags |= PREF_RTL;
+
+				SendMessage(hwndEdit, WM_SETREDRAW, TRUE, 0);
+				SendMessage(hwndEdit, EM_SETSEL, -1, -1);
+				InvalidateRect(hwndEdit, NULL, FALSE);
 
-					memcpy(dat->sendBuffer, (char*)utfResult, memRequired);
+				if (memRequired > dat->iSendBufferSize) {
+					dat->sendBuffer = (char *)mir_realloc(dat->sendBuffer, memRequired);
+					dat->iSendBufferSize = memRequired;
 				}
 
+				memcpy(dat->sendBuffer, (char*)utfResult, memRequired);
+
 				if (memRequired == 0 || dat->sendBuffer[0] == 0)
 					break;
 
-- 
cgit v1.2.3