From d18fdf58c517c957809e9ec0b8044a05984de7c6 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Sat, 27 Jan 2024 20:23:20 +0300
Subject: =?UTF-8?q?fixes=20#4140=20(NewStory:=20=D1=83=D0=B4=D0=B0=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BE=D1=82=D0=B4=D0=B5=D0=BB=D1=8C?=
 =?UTF-8?q?=D0=BD=D1=8B=D1=85=20=D1=81=D0=BE=D0=BE=D0=B1=D1=89=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=B8=D0=B9)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/mir_app/src/mir_app.def         | 2 +-
 src/mir_app/src/mir_app64.def       | 2 +-
 src/mir_app/src/proto_interface.cpp | 2 +-
 src/mir_core/src/db.cpp             | 6 +++---
 4 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/mir_app/src/mir_app.def b/src/mir_app/src/mir_app.def
index 42d8f60e6c..db4932e80a 100644
--- a/src/mir_app/src/mir_app.def
+++ b/src/mir_app/src/mir_app.def
@@ -806,7 +806,7 @@ Srmm_CreateHotkey @886 NONAME
 ?OnCreateAccMgrUI@PROTO_INTERFACE@@UAEPAUHWND__@@PAU2@@Z @937 NONAME
 ?getMStringU@PROTO_INTERFACE@@QAE?AV?$CMStringT@DV?$ChTraitsCRT@D@@@@IPBD0@Z @938 NONAME
 ?getMStringU@PROTO_INTERFACE@@QAE?AV?$CMStringT@DV?$ChTraitsCRT@D@@@@PBD0@Z @939 NONAME
-?OnEventDeleted@PROTO_INTERFACE@@UAEXII@Z @940 NONAME
+?OnEventDeleted@PROTO_INTERFACE@@UAEXIIH@Z @940 NONAME
 Chat_IsMuted @941 NONAME
 ?Srmm_AddEvent@@YGXII@Z @942 NONAME
 ?iDiskLogFlags@Chat@@3V?$CMOption@I@@A @943 NONAME
diff --git a/src/mir_app/src/mir_app64.def b/src/mir_app/src/mir_app64.def
index 7274527130..e3de66bb95 100644
--- a/src/mir_app/src/mir_app64.def
+++ b/src/mir_app/src/mir_app64.def
@@ -806,7 +806,7 @@ Srmm_CreateHotkey @886 NONAME
 ?OnCreateAccMgrUI@PROTO_INTERFACE@@UEAAPEAUHWND__@@PEAU2@@Z @937 NONAME
 ?getMStringU@PROTO_INTERFACE@@QEAA?AV?$CMStringT@DV?$ChTraitsCRT@D@@@@IPEBD0@Z @938 NONAME
 ?getMStringU@PROTO_INTERFACE@@QEAA?AV?$CMStringT@DV?$ChTraitsCRT@D@@@@PEBD0@Z @939 NONAME
-?OnEventDeleted@PROTO_INTERFACE@@UEAAXII@Z @940 NONAME
+?OnEventDeleted@PROTO_INTERFACE@@UEAAXIIH@Z @940 NONAME
 Chat_IsMuted @941 NONAME
 ?Srmm_AddEvent@@YAXII@Z @942 NONAME
 ?iDiskLogFlags@Chat@@3V?$CMOption@I@@A @943 NONAME
diff --git a/src/mir_app/src/proto_interface.cpp b/src/mir_app/src/proto_interface.cpp
index 83c4f994f1..edb4c85e76 100644
--- a/src/mir_app/src/proto_interface.cpp
+++ b/src/mir_app/src/proto_interface.cpp
@@ -82,7 +82,7 @@ MWindow PROTO_INTERFACE::OnCreateAccMgrUI(MWindow)
 	return nullptr; // error
 }
 
-void PROTO_INTERFACE::OnEventDeleted(MCONTACT, MEVENT)
+void PROTO_INTERFACE::OnEventDeleted(MCONTACT, MEVENT, int)
 {}
 
 void PROTO_INTERFACE::OnEventEdited(MCONTACT, MEVENT, const DBEVENTINFO &)
diff --git a/src/mir_core/src/db.cpp b/src/mir_core/src/db.cpp
index 57b22754c3..8fd08f873d 100644
--- a/src/mir_core/src/db.cpp
+++ b/src/mir_core/src/db.cpp
@@ -413,15 +413,15 @@ MIR_CORE_DLL(int) db_event_count(MCONTACT hContact)
 	return (g_pCurrDb == nullptr) ? 0 : g_pCurrDb->GetEventCount(hContact);
 }
 
-MIR_CORE_DLL(int) db_event_delete(MEVENT hDbEvent, bool bFromServer)
+MIR_CORE_DLL(int) db_event_delete(MEVENT hDbEvent, int flags)
 {
 	if (g_pCurrDb == nullptr)
 		return 0;
 	
-	if (!bFromServer) {
+	if (!(flags & CDF_FROM_SERVER)) {
 		MCONTACT hContact = g_pCurrDb->GetEventContact(hDbEvent);
 		if (auto *ppro = Proto_GetInstance(hContact))
-			ppro->OnEventDeleted(hContact, hDbEvent);
+			ppro->OnEventDeleted(hContact, hDbEvent, flags);
 	}
 
 	return g_pCurrDb->DeleteEvent(hDbEvent);
-- 
cgit v1.2.3