MrBesen
/
tdesktop
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Switch XDP open with dialog to QWaylandWindow::requestXdgActivationToken

This commit is contained in:
Ilya Fedin 2023-09-07 00:19:09 +04:00 committed by John Preston
parent e52e1672e8
commit 566f2dd670
2 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Telegram/SourceFiles/platform/linux/linux_xdp_open_with_dialog.cpp
View File

@ -9,7 +9,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "base/platform/base_platform_info.h"
#include "base/platform/linux/base_linux_xdp_utilities.h"
#include "base/platform/linux/base_linux_wayland_integration.h"
#include "base/platform/linux/base_linux_xdg_activation_token.h"
#include "base/random.h"
#include <fcntl.h>
@ -23,6 +23,7 @@ namespace {
constexpr auto kXDPOpenURIInterface = "org.freedesktop.portal.OpenURI";
constexpr auto kPropertiesInterface = "org.freedesktop.DBus.Properties";
const auto XdgActivationToken = base::Platform::XdgActivationToken;
} // namespace
@ -61,14 +62,6 @@ bool ShowXDPOpenWithDialog(const QString &filepath) {
const auto handleToken = Glib::ustring("tdesktop")
+ std::to_string(base::RandomValue<uint>());
const auto activationToken = []() -> Glib::ustring {
using base::Platform::WaylandIntegration;
if (const auto integration = WaylandIntegration::Instance()) {
return integration->activationToken().toStdString();
}
return {};
}();
auto uniqueName = connection->get_unique_name();
uniqueName.erase(0, 1);
uniqueName.replace(uniqueName.find('.'), 1, 1, '_');
@ -118,7 +111,8 @@ bool ShowXDPOpenWithDialog(const QString &filepath) {
},
{
"activation_token",
Glib::create_variant(activationToken)
Glib::create_variant(
Glib::ustring(XdgActivationToken().toStdString()))
},
{
"ask",

2
Telegram/lib_base

@ -1 +1 @@
Subproject commit c36d961eaf3d3a09d100509196aa039958f264bc
Subproject commit a7c44bbf531b5e547c92b6fcdd48ca6cdd18b9d2