Merge branch 'master' of https://github.com/miranda-ng/miranda-ng

6 files changed, 24 insertions, 29 deletions

diff --git a/src/mir_app/src/MHttpRequest.cpp b/src/mir_app/src/MHttpRequest.cpp
index b44da4c750..a95678e5e7 100644
--- a/src/mir_app/src/MHttpRequest.cpp
+++ b/src/mir_app/src/MHttpRequest.cpp
@@ -63,6 +63,15 @@ MIR_APP_DLL(MHttpRequest*) operator<<(MHttpRequest *pReq, const INT64_PARAM &par
 	return pReq;

 }

 

+MIR_APP_DLL(MHttpRequest *) operator<<(MHttpRequest *pReq, const BOOL_PARAM &param)

+{

+	CMStringA &s = pReq->m_szParam;

+	if (!s.IsEmpty())

+		s.AppendChar('&');

+	s.AppendFormat("%s=%s", param.szName, param.bValue ? "true" : "false");

+	return pReq;

+}

+

 MIR_APP_DLL(MHttpRequest*) operator<<(MHttpRequest *pReq, const CHAR_PARAM &param)

 {

 	CMStringA &s = pReq->m_szParam;

diff --git a/src/mir_app/src/mir_app.def b/src/mir_app/src/mir_app.def
index 253c54a094..db67abbdcf 100644
--- a/src/mir_app/src/mir_app.def
+++ b/src/mir_app/src/mir_app.def
@@ -1003,3 +1003,4 @@ Proto_CanDeleteHistory @1118 NONAME
 ?data@JsonReply@@QBEAAVJSONNode@@XZ @1134 NONAME

 ?error@JsonReply@@QBEHXZ @1135 NONAME

 ??BJsonReply@@QBE_NXZ @1136 NONAME

+??6@YGPAUMHttpRequest@@PAU0@ABUBOOL_PARAM@@@Z @1137 NONAME

diff --git a/src/mir_app/src/mir_app64.def b/src/mir_app/src/mir_app64.def
index 61117b7741..4b314b0a54 100644
--- a/src/mir_app/src/mir_app64.def
+++ b/src/mir_app/src/mir_app64.def
@@ -1003,3 +1003,4 @@ Proto_CanDeleteHistory @1118 NONAME
 ?data@JsonReply@@QEBAAEAVJSONNode@@XZ @1134 NONAME

 ?error@JsonReply@@QEBAHXZ @1135 NONAME

 ??BJsonReply@@QEBA_NXZ @1136 NONAME

+??6@YAPEAUMHttpRequest@@PEAU0@AEBUBOOL_PARAM@@@Z @1137 NONAME

diff --git a/src/mir_app/src/netlib_websocket.cpp b/src/mir_app/src/netlib_websocket.cpp
index 185e320636..196b22a816 100644
--- a/src/mir_app/src/netlib_websocket.cpp
+++ b/src/mir_app/src/netlib_websocket.cpp
@@ -187,6 +187,8 @@ static void WebSocket_Send(HNETLIBCONN nlc, const void *pData, int64_t dataLen,
 void MWebSocket::sendText(const char *pData)

 {

 	if (m_hConn && pData) {

+		Netlib_Dump(m_hConn, pData, strlen(pData), true, 0);

+

 		mir_cslock lck(m_cs);

 		WebSocket_Send(m_hConn, pData, strlen(pData), 1);

 	}

diff --git a/src/mir_app/src/proto_order.cpp b/src/mir_app/src/proto_order.cpp
index d8694f0197..c46733feac 100644
--- a/src/mir_app/src/proto_order.cpp
+++ b/src/mir_app/src/proto_order.cpp
@@ -25,12 +25,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "stdafx.h"

 #include "clc.h"

 

-struct ProtocolData

-{

-	char *RealName;

-	int enabled;

-};

-

 bool CheckProtocolOrder(void)

 {

 	bool changed = false;

@@ -127,15 +121,13 @@ class CProtocolOrderOpts : public CDlgBase
 			if (!ProtoToInclude(pa))

 				continue;

 

-			ProtocolData *PD = (ProtocolData*)mir_alloc(sizeof(ProtocolData));

-			PD->RealName = pa->szModuleName;

-			PD->enabled = pa->IsEnabled() && isProtoSuitable(pa->ppro);

-

-			tvis.item.lParam = (LPARAM)PD;

-			tvis.item.pszText = pa->tszAccountName;

-			tvis.item.stateMask = TVIS_STATEIMAGEMASK;

-			tvis.item.state = INDEXTOSTATEIMAGEMASK((PD->enabled) ? (pa->bIsVisible ? 2 : 1) : 3);

-			m_order.InsertItem(&tvis);

+			if (pa->IsEnabled() && isProtoSuitable(pa->ppro)) {

+				tvis.item.lParam = (LPARAM)pa->szModuleName;

+				tvis.item.pszText = pa->tszAccountName;

+				tvis.item.stateMask = TVIS_STATEIMAGEMASK;

+				tvis.item.state = INDEXTOSTATEIMAGEMASK(pa->bIsVisible ? 2 : 1);

+				m_order.InsertItem(&tvis);

+			}

 		}

 	}

 

@@ -151,7 +143,6 @@ public:
 		m_btnReset.OnClick = Callback(this, &CProtocolOrderOpts::onReset_Click);

 

 		m_order.SetFlags(MTREE_CHECKBOX | MTREE_DND);

-		m_order.OnDeleteItem = Callback(this, &CProtocolOrderOpts::onOrder_DeleteItem);

 	}

 

 	bool OnInitDialog() override

@@ -176,12 +167,10 @@ public:
 			m_order.GetItem(&tvi);

 

 			if (tvi.lParam != 0) {

-				ProtocolData *ppd = (ProtocolData*)tvi.lParam;

-				PROTOACCOUNT *pa = Proto_GetAccount(ppd->RealName);

+				PROTOACCOUNT *pa = Proto_GetAccount((char *)tvi.lParam);

 				if (pa != nullptr) {

 					pa->iOrder = idx++;

-					if (ppd->enabled)

-						pa->bIsVisible = m_order.GetCheckState(tvi.hItem) != 0;

+					pa->bIsVisible = m_order.GetCheckState(tvi.hItem) != 0;

 				}

 			}

 

@@ -209,13 +198,6 @@ public:
 		FillTree();

 		NotifyChange();

 	}

-

-	void onOrder_DeleteItem(CCtrlTreeView::TEventInfo *env)

-	{

-		NMTREEVIEW *pnmtv = env->nmtv;

-		if (pnmtv)

-			mir_free((ProtocolData*)pnmtv->itemOld.lParam);

-	}

 };

 

 int ProtocolOrderOptInit(WPARAM wParam, LPARAM)

diff --git a/src/mir_app/src/srmm_base.cpp b/src/mir_app/src/srmm_base.cpp
index fa4f27ce57..bca6e49148 100644
--- a/src/mir_app/src/srmm_base.cpp
+++ b/src/mir_app/src/srmm_base.cpp
@@ -1077,8 +1077,8 @@ bool CSrmmBaseDialog::ProcessFileDrop(HDROP hDrop, MCONTACT hContact)
 

 bool CSrmmBaseDialog::PasteFilesAsURL(HDROP hDrop)

 {

-	bool isShift = (GetKeyState(VK_SHIFT) & 0x8000) != 0;

-	if (db_get_b(0, CHAT_MODULE, "ShiftDropFilePasteURL", 1) == 0 || !isShift) // hidden setting: Chat/ShiftDropFilePasteURL

+	bool isShift = (GetKeyState(VK_SHIFT) & 0x8000) != 0, isCtrl = (GetKeyState(VK_CONTROL) & 0x8000) != 0;

+	if (db_get_b(0, CHAT_MODULE, "ShiftDropFilePasteURL", 1) == 0 || !(isShift && !isCtrl)) // hidden setting: Chat/ShiftDropFilePasteURL

 		return false;

 

 	int fileCount = DragQueryFileW(hDrop, -1, nullptr, 0);