RepoMirrors
/
tdesktop
mirror of https://github.com/telegramdesktop/tdesktop
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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:
Ilya Fedin 2022-11-29 00:29:45 +04:00 committed by John Preston
parent b9a766387c
commit 05524c3f6c
1 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp
View File

@ -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(