Move waitForInterfaceAnnounce call to the uses of announced interfaces
This commit is contained in:
parent
17be462d59
commit
80f1f079f1
|
@ -10,7 +10,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
|
||||||
#include "base/random.h"
|
#include "base/random.h"
|
||||||
#include "base/platform/base_platform_info.h"
|
#include "base/platform/base_platform_info.h"
|
||||||
#include "base/platform/linux/base_linux_wayland_integration.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_desktop_environment.h"
|
||||||
#include "platform/linux/linux_wayland_integration.h"
|
#include "platform/linux/linux_wayland_integration.h"
|
||||||
#include "lang/lang_keys.h"
|
#include "lang/lang_keys.h"
|
||||||
|
@ -58,7 +57,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
|
||||||
|
|
||||||
using namespace Platform;
|
using namespace Platform;
|
||||||
using BaseWaylandIntegration = base::Platform::WaylandIntegration;
|
using BaseWaylandIntegration = base::Platform::WaylandIntegration;
|
||||||
using UiWaylandIntegration = Ui::Platform::WaylandIntegration;
|
|
||||||
using Platform::internal::WaylandIntegration;
|
using Platform::internal::WaylandIntegration;
|
||||||
|
|
||||||
namespace Platform {
|
namespace Platform {
|
||||||
|
@ -740,11 +738,6 @@ void start() {
|
||||||
LOG(("Icon theme: %1").arg(QIcon::themeName()));
|
LOG(("Icon theme: %1").arg(QIcon::themeName()));
|
||||||
LOG(("Fallback icon theme: %1").arg(QIcon::fallbackThemeName()));
|
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
|
#ifndef DESKTOP_APP_DISABLE_DBUS_INTEGRATION
|
||||||
FileDialog::XDP::Start();
|
FileDialog::XDP::Start();
|
||||||
#endif // !DESKTOP_APP_DISABLE_DBUS_INTEGRATION
|
#endif // !DESKTOP_APP_DISABLE_DBUS_INTEGRATION
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
Subproject commit 01f07480b01953ef6fa1d7418e26baf37f0cb364
|
Subproject commit 183576ae657b864306249baed3b1e1ff39fe0a1f
|
Loading…
Reference in New Issue