Revert "fix: reply ids are not written for the outgoing messages"

This reverts commit 0b942877182ed44ad8cb064118d1468e21a89b6b.

4 files changed, 0 insertions, 12 deletions

diff --git a/plugins/Scriver/src/globals.cpp b/plugins/Scriver/src/globals.cpp
index 406d85b751..6ec8c203bd 100644
--- a/plugins/Scriver/src/globals.cpp
+++ b/plugins/Scriver/src/globals.cpp
@@ -123,7 +123,6 @@ static int ackevent(WPARAM, LPARAM lParam)
 		return 0;

 	}

 

-	char buf[100];

 	hContact = (db_mc_isMeta(hContact)) ? db_mc_getSrmmSub(item->hContact) : item->hContact;

 

 	DBEVENTINFO dbei = {};

@@ -134,10 +133,6 @@ static int ackevent(WPARAM, LPARAM lParam)
 	dbei.cbBlob = (int)mir_strlen(item->sendBuffer) + 1;

 	dbei.pBlob = item->sendBuffer;

 	dbei.szId = (char *)pAck->lParam;

-	if (item->hReplyEvent) {

-		itoa(item->hReplyEvent, buf, 10);

-		dbei.szReplyId = buf;

-	}

 

 	MessageWindowEvent evt = { item->hSendId, hContact, &dbei };

 	NotifyEventHooks(g_chatApi.hevPreCreate, 0, (LPARAM)&evt);

diff --git a/plugins/Scriver/src/msgutils.cpp b/plugins/Scriver/src/msgutils.cpp
index 5bfc286581..9167a4f3dd 100644
--- a/plugins/Scriver/src/msgutils.cpp
+++ b/plugins/Scriver/src/msgutils.cpp
@@ -260,7 +260,6 @@ void CMsgDialog::MessageSend(const SendQueue::Item &msi)
 	item->hContact = m_hContact;
 	item->proto = mir_strdup(m_szProto);
 	item->flags = msi.flags;
-	item->hReplyEvent = m_hQuoteEvent;
 	item->sendBufferSize = msi.sendBufferSize;
 	item->sendBuffer = mir_strndup(msi.sendBuffer, msi.sendBufferSize);
 	SendQueue::SendItem(item);
diff --git a/plugins/Scriver/src/sendqueue.h b/plugins/Scriver/src/sendqueue.h
index a99088628f..0fc3658678 100644
--- a/plugins/Scriver/src/sendqueue.h
+++ b/plugins/Scriver/src/sendqueue.h
@@ -36,7 +36,6 @@ namespace SendQueue
 

 		CMsgDialog *pDlg;

 		MCONTACT hContact;

-		MEVENT hReplyEvent;

 		char  *proto;

 		int    hSendId;

 		int    timeout;

diff --git a/plugins/TabSRMM/src/sendqueue.cpp b/plugins/TabSRMM/src/sendqueue.cpp
index 8bb84faa2c..fe4d158e73 100644
--- a/plugins/TabSRMM/src/sendqueue.cpp
+++ b/plugins/TabSRMM/src/sendqueue.cpp
@@ -457,7 +457,6 @@ int SendQueue::ackMessage(CMsgDialog *dat, WPARAM wParam, LPARAM lParam)
 		return 0;

 	}

 

-	char buf[100];

 	DBEVENTINFO dbei = {};

 	dbei.eventType = EVENTTYPE_MESSAGE;

 	dbei.flags = DBEF_SENT | DBEF_UTF;

@@ -476,10 +475,6 @@ int SendQueue::ackMessage(CMsgDialog *dat, WPARAM wParam, LPARAM lParam)
 		dbei.flags |= DBEF_RTL;

 	dbei.pBlob = job.szSendBuffer;

 	dbei.szId = (char *)ack->lParam;

-	if (job.hEvent) {

-		itoa(job.hEvent, buf, 10);

-		dbei.szReplyId = buf;

-	}

 

 	MessageWindowEvent evt = { job.iSendId, job.hContact, &dbei };

 	NotifyEventHooks(g_chatApi.hevPreCreate, 0, (LPARAM)&evt);