From cf91db5000d4f11745e2fe8bb6e7f5c6c6ba162a Mon Sep 17 00:00:00 2001 From: George Hazan Date: Wed, 15 Mar 2023 18:08:51 +0300 Subject: SRMM: common code exctracted to a Srmm_AddEvent() function --- src/core/stdmsg/src/msgs.cpp | 32 +++++--------------------------- 1 file changed, 5 insertions(+), 27 deletions(-) (limited to 'src/core/stdmsg') diff --git a/src/core/stdmsg/src/msgs.cpp b/src/core/stdmsg/src/msgs.cpp index 121856ce37..d2b21d2173 100644 --- a/src/core/stdmsg/src/msgs.cpp +++ b/src/core/stdmsg/src/msgs.cpp @@ -65,13 +65,13 @@ static int SRMMStatusToPf2(int status) return 0; } -static int MessageEventAdded(WPARAM hContact, LPARAM lParam) +static int MessageEventAdded(WPARAM hContact, LPARAM hDbEvent) { if (hContact == 0 || Contact::IsGroupChat(hContact)) return 0; DBEVENTINFO dbei = {}; - if (db_event_get(lParam, &dbei)) + if (db_event_get(hDbEvent, &dbei)) return 0; if (dbei.flags & (DBEF_SENT | DBEF_READ) || !(dbei.eventType == EVENTTYPE_MESSAGE || DbEventIsForMsgWindow(&dbei))) @@ -105,17 +105,7 @@ static int MessageEventAdded(WPARAM hContact, LPARAM lParam) } } - wchar_t toolTip[256]; - mir_snwprintf(toolTip, TranslateT("Message from %s"), Clist_GetContactDisplayName(hContact)); - - CLISTEVENT cle = {}; - cle.hContact = hContact; - cle.hDbEvent = lParam; - cle.flags = CLEF_UNICODE; - cle.hIcon = Skin_LoadIcon(SKINICON_EVENT_MESSAGE); - cle.pszService = MS_MSG_READMESSAGE; - cle.szTooltip.w = toolTip; - g_clistApi.pfnAddEvent(&cle); + Srmm_AddEvent(hContact, hDbEvent); return 0; } @@ -283,20 +273,8 @@ static void RestoreUnreadMessageAlerts(void) } } - wchar_t toolTip[256]; - - CLISTEVENT cle = {}; - cle.hIcon = Skin_LoadIcon(SKINICON_EVENT_MESSAGE); - cle.pszService = MS_MSG_READMESSAGE; - cle.flags = CLEF_UNICODE; - cle.szTooltip.w = toolTip; - - for (auto &e : arEvents) { - mir_snwprintf(toolTip, TranslateT("Message from %s"), Clist_GetContactDisplayName(e->hContact)); - cle.hContact = e->hContact; - cle.hDbEvent = e->hEvent; - g_clistApi.pfnAddEvent(&cle); - } + for (auto &e : arEvents) + Srmm_AddEvent(e->hContact, e->hEvent); } void RegisterSRMMFonts(void); -- cgit v1.2.3