From efc8291dafe68435480bb5dd378cf26ee62d042f Mon Sep 17 00:00:00 2001 From: George Hazan Date: Thu, 14 Nov 2024 17:24:43 +0300 Subject: =?UTF-8?q?fixes=20#4641=20(Telegram:=20=D1=83=D0=B4=D0=B0=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D1=81=20=D1=81=D0=B5=D1=80=D0=B2?= =?UTF-8?q?=D0=B5=D1=80=D0=B0=20=D1=87=D1=83=D0=B6=D0=B8=D1=85=20=D1=81?= =?UTF-8?q?=D0=BE=D0=BE=D0=B1=D1=89=D0=B5=D0=BD=D0=B8=D0=B9=20=D0=B3=D1=80?= =?UTF-8?q?=D1=83=D0=BF=D1=87=D0=B0=D1=82=D0=B0,=20=D0=B5=D1=81=D0=BB?= =?UTF-8?q?=D0=B8=20=D0=BF=D0=BE=D0=BB=D1=8C=D0=B7=D0=BE=D0=B2=D0=B0=D1=82?= =?UTF-8?q?=D0=B5=D0=BB=D1=8C=20=D0=9C=D0=B8=D1=80=D0=B0=D0=BD=D0=B4=D1=8B?= =?UTF-8?q?=20=D0=BD=D0=B5=20=D0=BC=D0=BE=D0=B4=D0=B5=D1=80=D0=B0=D1=82?= =?UTF-8?q?=D0=BE=D1=80/=D0=B2=D0=BB=D0=B0=D0=B4=D0=B5=D0=BB=D0=B5=D1=86)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/mir_app/src/menu_clist.cpp | 4 ++-- src/mir_app/src/mir_app.def | 2 +- src/mir_app/src/proto_utils.cpp | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/mir_app/src/menu_clist.cpp b/src/mir_app/src/menu_clist.cpp index edffe8e774..2bdcc8df49 100644 --- a/src/mir_app/src/menu_clist.cpp +++ b/src/mir_app/src/menu_clist.cpp @@ -699,7 +699,7 @@ void RebuildMenuOrder(void) if (!pa->IsVisible()) continue; - uint32_t flags = pa->ppro->GetCaps(PFLAGNUM_2, 0) & ~pa->ppro->GetCaps(PFLAGNUM_5, 0); + uint32_t flags = pa->ppro->GetCaps(PFLAGNUM_2) & ~pa->ppro->GetCaps(PFLAGNUM_5); HICON ic; wchar_t tbuf[256]; int pos = 0; @@ -797,7 +797,7 @@ void RebuildMenuOrder(void) if (!pa->IsVisible()) continue; - uint32_t flags = pa->ppro->GetCaps(PFLAGNUM_2, 0) & ~pa->ppro->GetCaps(PFLAGNUM_5, 0); + uint32_t flags = pa->ppro->GetCaps(PFLAGNUM_2) & ~pa->ppro->GetCaps(PFLAGNUM_5); if (!(flags & it.Pf2flag)) continue; diff --git a/src/mir_app/src/mir_app.def b/src/mir_app/src/mir_app.def index cb3f7515ec..2bf1f10949 100644 --- a/src/mir_app/src/mir_app.def +++ b/src/mir_app/src/mir_app.def @@ -984,7 +984,7 @@ g_hevEventSetJson @1103 NONAME ??1MJsonWebSocket@@QAE@XZ @1115 NONAME ??_7MJsonWebSocket@@6B@ @1116 NONAME ?process@MJsonWebSocket@@EAEXPBEI@Z @1117 NONAME -_Proto_CanDeleteHistory@8 @1118 NONAME +Proto_CanDeleteHistory @1118 NONAME ?OnCacheInit@PROTO_INTERFACE@@UAEXXZ @1119 NONAME ?DoRtfToTags@CSrmmBaseDialog@@IBE_NAAV?$CMStringT@_WV?$ChTraitsCRT@_W@@@@@Z @1120 NONAME ?bUseGroup@Chat@@3V?$CMOption@_N@@A @1121 NONAME diff --git a/src/mir_app/src/proto_utils.cpp b/src/mir_app/src/proto_utils.cpp index 10702e1473..903355a6c2 100644 --- a/src/mir_app/src/proto_utils.cpp +++ b/src/mir_app/src/proto_utils.cpp @@ -105,13 +105,13 @@ MIR_APP_DLL(INT_PTR) ProtoBroadcastAck(const char *szModule, MCONTACT hContact, ///////////////////////////////////////////////////////////////////////////////////////// -MIR_APP_DLL(bool) Proto_CanDeleteHistory(const char *szModule, MCONTACT hContact) +MIR_APP_DLL(bool) Proto_CanDeleteHistory(const char *szModule, MCONTACT hContact, bool bIncoming) { if (!ProtoServiceExists(szModule, PS_EMPTY_SRV_HISTORY)) return false; // CallProtoService can return CALLSERVICE_NOTFOUND, we don't care - return CallProtoService(szModule, PS_CAN_EMPTY_HISTORY, hContact) != 0; + return CallProtoService(szModule, PS_CAN_EMPTY_HISTORY, hContact, bIncoming) != 0; } ///////////////////////////////////////////////////////////////////////////////////////// -- cgit v1.2.3