Skip to content

Commit 9046b2c

Browse files
ilya-fedinjohn-preston
authored andcommitted
Stop using the plasma-shell protocol
Looks like this isn't really correct in combination with xdg-shell
1 parent 3d994b5 commit 9046b2c

8 files changed

Lines changed: 0 additions & 259 deletions

File tree

‎.gitmodules‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,9 +82,6 @@
8282
[submodule "Telegram/ThirdParty/dispatch"]
8383
path = Telegram/ThirdParty/dispatch
8484
url = https://github.com/apple/swift-corelibs-libdispatch
85-
[submodule "Telegram/ThirdParty/plasma-wayland-protocols"]
86-
path = Telegram/ThirdParty/plasma-wayland-protocols
87-
url = https://github.com/KDE/plasma-wayland-protocols.git
8885
[submodule "Telegram/ThirdParty/wayland-protocols"]
8986
path = Telegram/ThirdParty/wayland-protocols
9087
url = https://github.com/gitlab-freedesktop-mirrors/wayland-protocols.git

‎Telegram/CMakeLists.txt‎

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1199,9 +1199,6 @@ PRIVATE
11991199
payments/payments_checkout_process.h
12001200
payments/payments_form.cpp
12011201
payments/payments_form.h
1202-
platform/linux/linux_wayland_integration_dummy.cpp
1203-
platform/linux/linux_wayland_integration.cpp
1204-
platform/linux/linux_wayland_integration.h
12051202
platform/linux/file_utilities_linux.cpp
12061203
platform/linux/file_utilities_linux.h
12071204
platform/linux/launcher_linux.cpp
@@ -1554,16 +1551,6 @@ if (NOT build_winstore)
15541551
)
15551552
endif()
15561553

1557-
if (DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION)
1558-
remove_target_sources(Telegram ${src_loc}
1559-
platform/linux/linux_wayland_integration.cpp
1560-
)
1561-
else()
1562-
remove_target_sources(Telegram ${src_loc}
1563-
platform/linux/linux_wayland_integration_dummy.cpp
1564-
)
1565-
endif()
1566-
15671554
if (DESKTOP_APP_USE_PACKAGED)
15681555
remove_target_sources(Telegram ${src_loc}
15691556
platform/mac/mac_iconv_helper.c
@@ -1701,19 +1688,6 @@ else()
17011688
desktop-app::external_xcb
17021689
)
17031690
endif()
1704-
1705-
if (NOT DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION)
1706-
qt_generate_wayland_protocol_client_sources(Telegram
1707-
FILES
1708-
${third_party_loc}/wayland/protocol/wayland.xml
1709-
${third_party_loc}/plasma-wayland-protocols/src/protocols/plasma-shell.xml
1710-
)
1711-
1712-
target_link_libraries(Telegram
1713-
PRIVATE
1714-
desktop-app::external_wayland_client
1715-
)
1716-
endif()
17171691
endif()
17181692

17191693
if (build_macstore)

‎Telegram/SourceFiles/platform/linux/linux_wayland_integration.cpp‎

Lines changed: 0 additions & 150 deletions
This file was deleted.

‎Telegram/SourceFiles/platform/linux/linux_wayland_integration.h‎

Lines changed: 0 additions & 29 deletions
This file was deleted.

‎Telegram/SourceFiles/platform/linux/linux_wayland_integration_dummy.cpp‎

Lines changed: 0 additions & 37 deletions
This file was deleted.

‎Telegram/SourceFiles/platform/linux/main_window_linux.cpp‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ For license and copyright information please follow this link:
99

1010
#include "styles/style_window.h"
1111
#include "platform/linux/specific_linux.h"
12-
#include "platform/linux/linux_wayland_integration.h"
1312
#include "history/history.h"
1413
#include "history/history_widget.h"
1514
#include "history/history_inner_widget.h"
@@ -48,7 +47,6 @@ For license and copyright information please follow this link:
4847
namespace Platform {
4948
namespace {
5049

51-
using internal::WaylandIntegration;
5250
using WorkMode = Core::Settings::WorkMode;
5351

5452
#ifndef DESKTOP_APP_DISABLE_X11_INTEGRATION
@@ -102,11 +100,6 @@ void XCBSkipTaskbar(QWindow *window, bool skip) {
102100
#endif // !DESKTOP_APP_DISABLE_X11_INTEGRATION
103101

104102
void SkipTaskbar(QWindow *window, bool skip) {
105-
if (const auto integration = WaylandIntegration::Instance()) {
106-
integration->skipTaskbar(window, skip);
107-
return;
108-
}
109-
110103
#ifndef DESKTOP_APP_DISABLE_X11_INTEGRATION
111104
if (IsX11()) {
112105
XCBSkipTaskbar(window, skip);

‎Telegram/SourceFiles/platform/linux/specific_linux.cpp‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ For license and copyright information please follow this link:
1212
#include "base/platform/linux/base_linux_dbus_utilities.h"
1313
#include "base/platform/linux/base_linux_xdp_utilities.h"
1414
#include "ui/platform/ui_platform_window_title.h"
15-
#include "platform/linux/linux_wayland_integration.h"
1615
#include "lang/lang_keys.h"
1716
#include "mainwindow.h"
1817
#include "storage/localstorage.h"
@@ -53,7 +52,6 @@ namespace {
5352
using namespace gi::repository;
5453
namespace GObject = gi::repository::GObject;
5554
using namespace Platform;
56-
using Platform::internal::WaylandIntegration;
5755

5856
void PortalAutostart(bool enabled, Fn<void(bool)> done) {
5957
const auto executable = ExecutablePathForShortcuts();
@@ -563,10 +561,6 @@ bool TrayIconSupported() {
563561
}
564562

565563
bool SkipTaskbarSupported() {
566-
if (const auto integration = WaylandIntegration::Instance()) {
567-
return integration->skipTaskbarSupported();
568-
}
569-
570564
#ifndef DESKTOP_APP_DISABLE_X11_INTEGRATION
571565
if (IsX11()) {
572566
return base::Platform::XCB::IsSupportedByWM(
Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)