mir/kotatogram-desktop
2
0
Fork 0
mirror of https://github.com/kotatogram/kotatogram-desktop synced 2025-09-02 07:35:12 +00:00
Code Issues Releases Wiki Activity

Update to the new cppgir API

Browse Source
This commit is contained in:
Ilya Fedin
2023-12-18 20:48:49 +04:00
committed by John Preston
parent 5a47ed268c
commit 931c17418d
5 changed files with 27 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
Telegram/SourceFiles/platform/linux/integration_linux.cpp
View File

@@ -55,17 +55,17 @@ public:
});
}
void open_(GFile **files, int n_files, const char*) noexcept override {
Core::Sandbox::Instance().customEnterFromEventLoop([&] {
for (int i = 0; i < n_files; ++i) {
QFileOpenEvent e(
QUrl(QString::fromUtf8(g_file_get_uri(files[i]))));
QGuiApplication::sendEvent(qApp, &e);
}
});
void open_(
gi::Collection<gi::DSpan, ::GFile*, gi::transfer_none_t> files,
const gi::cstring_v hint) noexcept override {
for (auto file : files) {
QFileOpenEvent e(QUrl(QString::fromStdString(file.get_uri())));
QGuiApplication::sendEvent(qApp, &e);
}
}
void add_platform_data_(GLib::VariantBuilder builder) noexcept override {
void add_platform_data_(
GLib::VariantBuilder_Ref builder) noexcept override {
if (Platform::IsWayland()) {
const auto token = qgetenv("XDG_ACTIVATION_TOKEN");
if (!token.isEmpty()) {
@@ -113,8 +113,7 @@ Application::Application()
Glib::create_variant(
NotificationId().toTuple()
).get_type().gobj_copy(),
gi::transfer_full,
gi::direction_out
gi::transfer_full
);
} catch (...) {
return GLib::VariantType();
@@ -239,11 +238,7 @@ void LinuxIntegration::initInhibit() {
return;
}
auto uniqueName = _inhibitProxy
.get_connection()
.get_unique_name()
.value_or("");
std::string uniqueName = _inhibitProxy.get_connection().get_unique_name();
uniqueName.erase(0, 1);
uniqueName.replace(uniqueName.find('.'), 1, 1, '_');
@@ -277,20 +272,18 @@ void LinuxIntegration::initInhibit() {
);
});
const auto options = std::array{
GLib::Variant::new_dict_entry(
GLib::Variant::new_string("handle_token"),
GLib::Variant::new_variant(
GLib::Variant::new_string(handleToken))),
GLib::Variant::new_dict_entry(
GLib::Variant::new_string("session_handle_token"),
GLib::Variant::new_variant(
GLib::Variant::new_string(sessionHandleToken))),
};
inhibit().call_create_monitor(
{},
GLib::Variant::new_array(options.data(), options.size()),
"",
GLib::Variant::new_array({
GLib::Variant::new_dict_entry(
GLib::Variant::new_string("handle_token"),
GLib::Variant::new_variant(
GLib::Variant::new_string(handleToken))),
GLib::Variant::new_dict_entry(
GLib::Variant::new_string("session_handle_token"),
GLib::Variant::new_variant(
GLib::Variant::new_string(sessionHandleToken))),
}),
nullptr);
}