diff options
| author | George Hazan <george.hazan@gmail.com> | 2024-11-14 17:24:43 +0300 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2024-11-14 17:24:43 +0300 |
| commit | efc8291dafe68435480bb5dd378cf26ee62d042f (patch) | |
| tree | e8242a4090dd360c0fae964759237c93017966c5 /src/mir_app | |
| parent | e76a4df48aa890a0e466c10f8bf6c40438ffb92a (diff) | |
fixes #4641 (Telegram: удаление с сервера чужих сообщений групчата, если пользователь Миранды не модератор/владелец)
Diffstat (limited to 'src/mir_app')
| -rw-r--r-- | src/mir_app/src/menu_clist.cpp | 4 | ||||
| -rw-r--r-- | src/mir_app/src/mir_app.def | 2 | ||||
| -rw-r--r-- | src/mir_app/src/proto_utils.cpp | 4 |
3 files changed, 5 insertions, 5 deletions
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;
}
/////////////////////////////////////////////////////////////////////////////////////////
|