From 80f1f079f15634fdd000234268cbf92509fa12d7 Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Thu, 14 Apr 2022 00:58:02 +0400 Subject: [PATCH] Move waitForInterfaceAnnounce call to the uses of announced interfaces --- Telegram/SourceFiles/platform/linux/specific_linux.cpp | 7 ------- Telegram/lib_ui | 2 +- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/Telegram/SourceFiles/platform/linux/specific_linux.cpp b/Telegram/SourceFiles/platform/linux/specific_linux.cpp index 9590e6934b..a066c32c4a 100644 --- a/Telegram/SourceFiles/platform/linux/specific_linux.cpp +++ b/Telegram/SourceFiles/platform/linux/specific_linux.cpp @@ -10,7 +10,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "base/random.h" #include "base/platform/base_platform_info.h" #include "base/platform/linux/base_linux_wayland_integration.h" -#include "ui/platform/linux/ui_linux_wayland_integration.h" #include "platform/linux/linux_desktop_environment.h" #include "platform/linux/linux_wayland_integration.h" #include "lang/lang_keys.h" @@ -58,7 +57,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL using namespace Platform; using BaseWaylandIntegration = base::Platform::WaylandIntegration; -using UiWaylandIntegration = Ui::Platform::WaylandIntegration; using Platform::internal::WaylandIntegration; namespace Platform { @@ -740,11 +738,6 @@ void start() { LOG(("Icon theme: %1").arg(QIcon::themeName())); LOG(("Fallback icon theme: %1").arg(QIcon::fallbackThemeName())); - // wait for interface announce to know if native window frame is supported - if (const auto integration = UiWaylandIntegration::Instance()) { - integration->waitForInterfaceAnnounce(); - } - #ifndef DESKTOP_APP_DISABLE_DBUS_INTEGRATION FileDialog::XDP::Start(); #endif // !DESKTOP_APP_DISABLE_DBUS_INTEGRATION diff --git a/Telegram/lib_ui b/Telegram/lib_ui index 01f07480b0..183576ae65 160000 --- a/Telegram/lib_ui +++ b/Telegram/lib_ui @@ -1 +1 @@ -Subproject commit 01f07480b01953ef6fa1d7418e26baf37f0cb364 +Subproject commit 183576ae657b864306249baed3b1e1ff39fe0a1f