From ba8991283405b28bba652ca51c17dfeeea10287d Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Mon, 24 Jun 2024 13:21:33 +0400
Subject: [PATCH] Switch more XCB code to base::Platform::XCB::Connection
---
Telegram/SourceFiles/platform/linux/main_window_linux.cpp | 4 ++--
Telegram/SourceFiles/platform/linux/specific_linux.cpp | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Telegram/SourceFiles/platform/linux/main_window_linux.cpp b/Telegram/SourceFiles/platform/linux/main_window_linux.cpp
index 9a8d3feeb..e4507c795 100644
--- a/Telegram/SourceFiles/platform/linux/main_window_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/main_window_linux.cpp
@@ -51,8 +51,8 @@ using WorkMode = Core::Settings::WorkMode;
#ifndef DESKTOP_APP_DISABLE_X11_INTEGRATION
void XCBSkipTaskbar(QWindow *window, bool skip) {
- const auto connection = base::Platform::XCB::GetConnectionFromQt();
- if (!connection) {
+ const base::Platform::XCB::Connection connection;
+ if (!connection || xcb_connection_has_error(connection)) {
return;
}
diff --git a/Telegram/SourceFiles/platform/linux/specific_linux.cpp b/Telegram/SourceFiles/platform/linux/specific_linux.cpp
index c874ae71d..474f47746 100644
--- a/Telegram/SourceFiles/platform/linux/specific_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/specific_linux.cpp
@@ -564,7 +564,7 @@ bool SkipTaskbarSupported() {
#ifndef DESKTOP_APP_DISABLE_X11_INTEGRATION
if (IsX11()) {
return base::Platform::XCB::IsSupportedByWM(
- base::Platform::XCB::GetConnectionFromQt(),
+ base::Platform::XCB::Connection(),
"_NET_WM_STATE_SKIP_TASKBAR");
}
#endif // !DESKTOP_APP_DISABLE_X11_INTEGRATION