diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/mir_app/src/mir_app.def | 2 | ||||
| -rw-r--r-- | src/mir_app/src/mir_app64.def | 2 | ||||
| -rw-r--r-- | src/mir_app/src/proto_interface.cpp | 2 | ||||
| -rw-r--r-- | src/mir_core/src/db.cpp | 6 |
4 files changed, 6 insertions, 6 deletions
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);
|