void/AyuGramDesktop
2
0
Fork 0
mirror of https://github.com/AyuGram/AyuGramDesktop.git synced 2025-06-05 06:33:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use gi::cstring for notification actions

Browse source
This commit is contained in:
Ilya Fedin 2025-02-26 18:13:46 +00:00 • committed by John Preston
parent 86f7d09d31
commit 3569615b21
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp
View file

@ -174,7 +174,7 @@ private:
XdgNotifications::Notifications _interface; XdgNotifications::Notifications _interface;
std::string _title; std::string _title;
std::string _body; std::string _body;
std::vector<std::string> _actions; std::vector<gi::cstring> _actions;
GLib::VariantDict _hints; GLib::VariantDict _hints;
std::string _imageKey; std::string _imageKey;
@ -362,6 +362,8 @@ bool NotificationData::init(const Info &info) {
_lifetime.add([=] { _lifetime.add([=] {
_interface.disconnect(activationTokenSignalId); _interface.disconnect(activationTokenSignalId);
}); });
_actions.push_back({});
} }
if (HasCapability("action-icons")) { if (HasCapability("action-icons")) {
@ -441,11 +443,6 @@ void NotificationData::show() {
// a hack for snap's activation restriction // a hack for snap's activation restriction
const auto weak = base::make_weak(this); const auto weak = base::make_weak(this);
StartServiceAsync(_proxy.get_connection(), crl::guard(weak, [=] { StartServiceAsync(_proxy.get_connection(), crl::guard(weak, [=] {
auto actions = _actions
| ranges::views::transform(&std::string::c_str)
| ranges::to_vector;
actions.push_back(nullptr);
const auto callbackWrap = gi::unwrap( const auto callbackWrap = gi::unwrap(
Gio::AsyncReadyCallback( Gio::AsyncReadyCallback(
crl::guard(weak, [=](GObject::Object, Gio::AsyncResult res) { crl::guard(weak, [=](GObject::Object, Gio::AsyncResult res) {
@ -476,7 +473,11 @@ void NotificationData::show() {
: std::string()).c_str(), : std::string()).c_str(),
_title.c_str(), _title.c_str(),
_body.c_str(), _body.c_str(),
actions.data(), !_actions.empty()
? (_actions
| ranges::views::transform(&gi::cstring::c_str)
| ranges::to_vector).data()
: nullptr,
_hints.end().gobj_(), _hints.end().gobj_(),
-1, -1,
nullptr, nullptr,