From d881019c3b069ff7d06a03bcb38242d43a0366aa Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Sun, 10 Mar 2024 02:11:58 +0400 Subject: [PATCH] Update submodules --- .../platform/linux/linux_xdp_open_with_dialog.cpp | 2 +- Telegram/SourceFiles/platform/linux/specific_linux.cpp | 5 +---- Telegram/lib_base | 2 +- cmake | 2 +- 4 files changed, 4 insertions(+), 7 deletions(-) diff --git a/Telegram/SourceFiles/platform/linux/linux_xdp_open_with_dialog.cpp b/Telegram/SourceFiles/platform/linux/linux_xdp_open_with_dialog.cpp index bd82cb17f..9e409b900 100644 --- a/Telegram/SourceFiles/platform/linux/linux_xdp_open_with_dialog.cpp +++ b/Telegram/SourceFiles/platform/linux/linux_xdp_open_with_dialog.cpp @@ -91,7 +91,7 @@ bool ShowXDPOpenWithDialog(const QString &filepath) { }); auto result = interface.call_open_file_sync( - std::string(base::Platform::XDP::ParentWindowID()), + base::Platform::XDP::ParentWindowID(), GLib::Variant::new_handle(0), GLib::Variant::new_array({ GLib::Variant::new_dict_entry( diff --git a/Telegram/SourceFiles/platform/linux/specific_linux.cpp b/Telegram/SourceFiles/platform/linux/specific_linux.cpp index 7bbeb30c2..750c4dc5f 100644 --- a/Telegram/SourceFiles/platform/linux/specific_linux.cpp +++ b/Telegram/SourceFiles/platform/linux/specific_linux.cpp @@ -36,7 +36,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include #include -#include #include #include @@ -55,7 +54,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL namespace { using namespace gi::repository; -namespace Gio = gi::repository::Gio; using namespace Platform; using Platform::internal::WaylandIntegration; @@ -161,7 +159,7 @@ void PortalAutostart(bool enabled, Fn done) { commandline.push_back("-autostart"); interface.call_request_background( - std::string(base::Platform::XDP::ParentWindowID()), + base::Platform::XDP::ParentWindowID(), GLib::Variant::new_array({ GLib::Variant::new_dict_entry( GLib::Variant::new_string("handle_token"), @@ -695,7 +693,6 @@ void start() { GLib::set_application_name(AppName.data()); Glib::init(); - ::Gio::init(); Webview::WebKitGTK::SetSocketPath(u"%1/%2-%3-webview-%4"_q.arg( QDir::tempPath(), diff --git a/Telegram/lib_base b/Telegram/lib_base index 5b9556fdd..2a5567763 160000 --- a/Telegram/lib_base +++ b/Telegram/lib_base @@ -1 +1 @@ -Subproject commit 5b9556fddb9a67e514d0bed2c123e18cbe1663b7 +Subproject commit 2a55677634fef9f0c762c6305185fe773e3eae7b diff --git a/cmake b/cmake index 5a61112d6..5b703df9b 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit 5a61112d6d025b56573ad48bcc1331ac65c4a927 +Subproject commit 5b703df9b8fc5417969fa40ddf12952368ae227b