SRMM: sending quoted event as PSS_MESSAGE parameter

1 files changed, 6 insertions, 6 deletions

diff --git a/plugins/Scriver/src/msgtimedout.cpp b/plugins/Scriver/src/msgtimedout.cpp
index 2ea8412755..f65e9a2c29 100644
--- a/plugins/Scriver/src/msgtimedout.cpp
+++ b/plugins/Scriver/src/msgtimedout.cpp
@@ -28,12 +28,12 @@ class CErrorDlg : public CDlgBase
 	ptrW m_wszText;

 	CMStringW m_wszName, m_wszDescr;

 	CMsgDialog *m_pOwner;

-	MessageSendQueueItem *m_queueItem;

+	SendQueue::Item *m_queueItem;

 

 	CCtrlBase m_errorText, m_msgText;

 

 public:

-	CErrorDlg(CMsgDialog *pOwner, const wchar_t *pwszDescr, MessageSendQueueItem *pItem) :

+	CErrorDlg(CMsgDialog *pOwner, const wchar_t *pwszDescr, SendQueue::Item *pItem) :

 		CDlgBase(g_plugin, IDD_MSGSENDERROR),

 		m_pOwner(pOwner),

 		m_wszText(mir_utf8decodeW(pItem->sendBuffer)),

@@ -75,21 +75,21 @@ public:
 	}

 };

 

-void CMsgDialog::ShowError(const wchar_t *pwszMsg, MessageSendQueueItem *pItem)

+void CMsgDialog::ShowError(const wchar_t *pwszMsg, SendQueue::Item *pItem)

 {

 	auto *pDlg = new CErrorDlg(this, pwszMsg, pItem);

 	pDlg->SetParent(m_hwnd);

 	pDlg->Show();

 }

 

-void CMsgDialog::HandleError(bool bRetry, MessageSendQueueItem *pItem)

+void CMsgDialog::HandleError(bool bRetry, SendQueue::Item *pItem)

 {

 	if (bRetry) {

 		StartMessageSending();

-		SendSendQueueItem(pItem);

+		SendQueue::SendItem(pItem);

 	}

 	else {

-		RemoveSendQueueItem(pItem);

+		SendQueue::RemoveItem(pItem);

 		SetFocus(m_message.GetHwnd());

 	}

 }