From 453ce1bff94b4ac37c9178fc37e0e544c42a7a61 Mon Sep 17 00:00:00 2001 From: John Preston Date: Mon, 29 Nov 2021 09:47:39 +0400 Subject: [PATCH] Beta version 3.2.6: Fix build on Linux. --- Telegram/SourceFiles/boxes/peers/add_participants_box.cpp | 1 - Telegram/SourceFiles/boxes/peers/edit_participants_box.cpp | 2 -- Telegram/SourceFiles/boxes/sessions_box.cpp | 2 -- Telegram/ThirdParty/tgcalls | 2 +- Telegram/cmake/lib_tgcalls.cmake | 6 +----- 5 files changed, 2 insertions(+), 11 deletions(-) diff --git a/Telegram/SourceFiles/boxes/peers/add_participants_box.cpp b/Telegram/SourceFiles/boxes/peers/add_participants_box.cpp index edaa07d05..01dbff4af 100644 --- a/Telegram/SourceFiles/boxes/peers/add_participants_box.cpp +++ b/Telegram/SourceFiles/boxes/peers/add_participants_box.cpp @@ -465,7 +465,6 @@ void AddSpecialBoxController::loadMoreRows() { MTP_long(participantsHash) )).done([=](const MTPchannels_ChannelParticipants &result) { _loadRequestId = 0; - auto &session = channel->session(); result.match([&](const MTPDchannels_channelParticipants &data) { const auto &[availableCount, list] = Api::ChatParticipants::Parse( channel, diff --git a/Telegram/SourceFiles/boxes/peers/edit_participants_box.cpp b/Telegram/SourceFiles/boxes/peers/edit_participants_box.cpp index 09b67a480..bc9b9508e 100644 --- a/Telegram/SourceFiles/boxes/peers/edit_participants_box.cpp +++ b/Telegram/SourceFiles/boxes/peers/edit_participants_box.cpp @@ -535,7 +535,6 @@ void ParticipantsAdditionalData::applyAdminLocally( UserData *user, ChatAdminRightsInfo rights, const QString &rank) { - const auto date = base::unixtime::now(); // Incorrect, but ignored. if (isCreator(user) && user->isSelf()) { applyParticipant(Api::ChatParticipant( Api::ChatParticipant::Type::Creator, @@ -571,7 +570,6 @@ void ParticipantsAdditionalData::applyBannedLocally( not_null participant, ChatRestrictionsInfo rights) { const auto user = participant->asUser(); - const auto date = base::unixtime::now(); // Incorrect, but ignored. if (!rights.flags) { if (user) { applyParticipant(Api::ChatParticipant( diff --git a/Telegram/SourceFiles/boxes/sessions_box.cpp b/Telegram/SourceFiles/boxes/sessions_box.cpp index d398dac53..1d4d01395 100644 --- a/Telegram/SourceFiles/boxes/sessions_box.cpp +++ b/Telegram/SourceFiles/boxes/sessions_box.cpp @@ -699,8 +699,6 @@ void SessionsContent::List::paintEvent(QPaintEvent *e) { const auto x = st::sessionPadding.left(); const auto y = st::sessionPadding.top(); const auto w = width(); - const auto xact = st::sessionTerminateSkip - + st::sessionTerminate.iconPosition.x(); p.translate(0, from * st::sessionHeight); for (auto i = from; i != till; ++i) { const auto &entry = _items[i]; diff --git a/Telegram/ThirdParty/tgcalls b/Telegram/ThirdParty/tgcalls index 0e3f3705e..6dbefa5bf 160000 --- a/Telegram/ThirdParty/tgcalls +++ b/Telegram/ThirdParty/tgcalls @@ -1 +1 @@ -Subproject commit 0e3f3705ecce37dc83ede0b04180a8cb0830aec3 +Subproject commit 6dbefa5bfc0fdf07eb42af103d8af0f481511c2a diff --git a/Telegram/cmake/lib_tgcalls.cmake b/Telegram/cmake/lib_tgcalls.cmake index bfb962d6e..722790bca 100644 --- a/Telegram/cmake/lib_tgcalls.cmake +++ b/Telegram/cmake/lib_tgcalls.cmake @@ -105,8 +105,6 @@ PRIVATE platform/darwin/DarwinInterface.mm platform/darwin/DarwinVideoSource.h platform/darwin/DarwinVideoSource.mm - platform/darwin/DesktopCaptureSourceView.h - platform/darwin/DesktopCaptureSourceView.mm platform/darwin/DesktopSharingCapturer.h platform/darwin/DesktopSharingCapturer.mm platform/darwin/GLVideoView.h @@ -147,7 +145,7 @@ PRIVATE platform/darwin/VideoMetalView.mm platform/darwin/VideoMetalViewMac.h platform/darwin/VideoMetalViewMac.mm - + # POSIX # Teleram Desktop @@ -187,8 +185,6 @@ elseif (APPLE) -fobjc-arc ) remove_target_sources(lib_tgcalls ${tgcalls_loc} - platform/darwin/DesktopCaptureSourceView.h - platform/darwin/DesktopCaptureSourceView.mm platform/darwin/GLVideoView.h platform/darwin/GLVideoView.mm platform/darwin/GLVideoViewMac.h