diff options
| author | George Hazan <ghazan@miranda.im> | 2023-04-14 18:48:50 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2023-04-14 18:48:50 +0300 |
| commit | 357bb36c10405e7571f9ebd41d8e11837ebd6175 (patch) | |
| tree | a1cd0dabe39ce913f7bf3356e47fc1d18363940e /src/mir_app | |
| parent | f12d6a4000cfce521392200635d1cadc63dba934 (diff) | |
duplicate code removed
Diffstat (limited to 'src/mir_app')
| -rw-r--r-- | src/mir_app/src/chat_svc.cpp | 4 | ||||
| -rw-r--r-- | src/mir_app/src/db_events.cpp | 14 | ||||
| -rw-r--r-- | src/mir_app/src/mir_app.def | 2 | ||||
| -rw-r--r-- | src/mir_app/src/mir_app64.def | 2 |
4 files changed, 20 insertions, 2 deletions
diff --git a/src/mir_app/src/chat_svc.cpp b/src/mir_app/src/chat_svc.cpp index e1257c5ea2..0e590cdeb3 100644 --- a/src/mir_app/src/chat_svc.cpp +++ b/src/mir_app/src/chat_svc.cpp @@ -842,8 +842,8 @@ static int OnEventAdded(WPARAM hContact, LPARAM hDbEvent) else {
g_clistApi.pfnRemoveEvent(hContact, 1);
- DBEVENTINFO dbei = {};
- if (!db_event_get(hDbEvent, &dbei)) {
+ DB::EventInfo dbei(hDbEvent, false);
+ if (dbei) {
if (auto *pDlg = Srmm_FindDialog(hContact))
pDlg->EventAdded(hDbEvent, dbei);
diff --git a/src/mir_app/src/db_events.cpp b/src/mir_app/src/db_events.cpp index 29436c5f51..25b7cf0da8 100644 --- a/src/mir_app/src/db_events.cpp +++ b/src/mir_app/src/db_events.cpp @@ -273,6 +273,20 @@ DB::EventInfo::~EventInfo() mir_free(pBlob);
}
+// could be displayed in a SRMM window
+bool DB::EventInfo::isSrmm() const
+{
+ auto *et = DbEvent_GetType(szModule, eventType);
+ return et && et->flags & DETF_MSGWINDOW;
+}
+
+// could be displayed in a history window
+bool DB::EventInfo::isHistory() const
+{
+ auto *et = DbEvent_GetType(szModule, eventType);
+ return et && et->flags & DETF_HISTORY;
+}
+
wchar_t* DB::EventInfo::getString(const char *str) const
{
if (flags & DBEF_UTF)
diff --git a/src/mir_app/src/mir_app.def b/src/mir_app/src/mir_app.def index 021694711d..6086dfd503 100644 --- a/src/mir_app/src/mir_app.def +++ b/src/mir_app/src/mir_app.def @@ -851,3 +851,5 @@ Chat_IsMuted @941 NONAME ?getString@EventInfo@DB@@QBEPA_WPBD@Z @967 NONAME
?InsertFileLink@CRtfLogWindow@@IAEXAAV?$CMStringT@DV?$ChTraitsCRT@D@@@@IABVFILE_BLOB@DB@@@Z @968 NONAME
?GetDialog@CSrmmLogWindow@@QBEAAVCMsgDialog@@XZ @969 NONAME
+?isHistory@EventInfo@DB@@QBE_NXZ @970 NONAME
+?isSrmm@EventInfo@DB@@QBE_NXZ @971 NONAME
diff --git a/src/mir_app/src/mir_app64.def b/src/mir_app/src/mir_app64.def index b888eb1a3b..678dd85842 100644 --- a/src/mir_app/src/mir_app64.def +++ b/src/mir_app/src/mir_app64.def @@ -851,3 +851,5 @@ Chat_IsMuted @941 NONAME ?getString@EventInfo@DB@@QEBAPEA_WPEBD@Z @967 NONAME
?InsertFileLink@CRtfLogWindow@@IEAAXAEAV?$CMStringT@DV?$ChTraitsCRT@D@@@@IAEBVFILE_BLOB@DB@@@Z @968 NONAME
?GetDialog@CSrmmLogWindow@@QEBAAEAVCMsgDialog@@XZ @969 NONAME
+?isHistory@EventInfo@DB@@QEBA_NXZ @970 NONAME
+?isSrmm@EventInfo@DB@@QEBA_NXZ @971 NONAME
|