mirror of
https://github.com/AyuGram/AyuGramDesktop.git
synced 2025-04-18 07:07:08 +02:00
Don't show reply button in Linux native notifications when it's not supposed to
All modern notification daemons have support for the default action and it's a requirement with the portal spec
This commit is contained in:
parent
b9a766387c
commit
05524c3f6c
1 changed files with 23 additions and 19 deletions
|
@ -431,10 +431,12 @@ bool NotificationData::init(
|
|||
idTuple);
|
||||
}
|
||||
|
||||
_notification->add_button(
|
||||
tr::lng_notification_reply(tr::now).toStdString(),
|
||||
"app.notification-reply",
|
||||
idTuple);
|
||||
if (!options.hideReplyButton) {
|
||||
_notification->add_button(
|
||||
tr::lng_notification_reply(tr::now).toStdString(),
|
||||
"app.notification-reply",
|
||||
idTuple);
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
@ -520,22 +522,24 @@ bool NotificationData::init(
|
|||
tr::lng_context_mark_read(tr::now).toStdString());
|
||||
}
|
||||
|
||||
if (capabilities.contains("inline-reply") && !options.hideReplyButton) {
|
||||
_actions.push_back("inline-reply");
|
||||
_actions.push_back(
|
||||
tr::lng_notification_reply(tr::now).toStdString());
|
||||
if (!options.hideReplyButton) {
|
||||
if (capabilities.contains("inline-reply")) {
|
||||
_actions.push_back("inline-reply");
|
||||
_actions.push_back(
|
||||
tr::lng_notification_reply(tr::now).toStdString());
|
||||
|
||||
_notificationRepliedSignalId = _dbusConnection->signal_subscribe(
|
||||
signalEmitted,
|
||||
std::string(kService),
|
||||
std::string(kInterface),
|
||||
"NotificationReplied",
|
||||
std::string(kObjectPath));
|
||||
} else {
|
||||
// icon name according to https://specifications.freedesktop.org/icon-naming-spec/icon-naming-spec-latest.html
|
||||
_actions.push_back("mail-reply-sender");
|
||||
_actions.push_back(
|
||||
tr::lng_notification_reply(tr::now).toStdString());
|
||||
_notificationRepliedSignalId = _dbusConnection->signal_subscribe(
|
||||
signalEmitted,
|
||||
std::string(kService),
|
||||
std::string(kInterface),
|
||||
"NotificationReplied",
|
||||
std::string(kObjectPath));
|
||||
} else {
|
||||
// icon name according to https://specifications.freedesktop.org/icon-naming-spec/icon-naming-spec-latest.html
|
||||
_actions.push_back("mail-reply-sender");
|
||||
_actions.push_back(
|
||||
tr::lng_notification_reply(tr::now).toStdString());
|
||||
}
|
||||
}
|
||||
|
||||
_actionInvokedSignalId = _dbusConnection->signal_subscribe(
|
||||
|
|
Loading…
Add table
Reference in a new issue