aboutsummaryrefslogtreecommitdiff
path: root/notify.c
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2024-07-23 17:08:21 +0000
committerDaniel Eklöf <daniel@ekloef.se>2024-07-23 17:08:21 +0000
commitecbec57a4749cc4162d2bb55dd14e1890b6dff31 (patch)
treebcccba1ce3cc6020a68b819cbc2363b333fa3d4c /notify.c
parentnotify: bug: always adjust amount of data left in stdout buffer (diff)
notify: split up the ${action} template parameter
Split it up into two, ${action-name} and ${action-label}. Dunstify, for example, has a different syntax compared to notify-send: notify-send: default=foobar dunstify: default,foobar
Diffstat (limited to 'notify.c')
-rw-r--r--notify.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/notify.c b/notify.c
index 2dd303db..71852c6a 100644
--- a/notify.c
+++ b/notify.c
@@ -78,7 +78,6 @@ fdm_notify_stdout(struct fdm *fdm, int fd, int events, void *data)
const struct terminal *term = data;
struct notification *notif = NULL;
-
/* Find notification */
tll_foreach(term->active_notifications, it) {
if (it->item.stdout_fd == fd) {
@@ -225,13 +224,13 @@ notify_notify(struct terminal *term, struct notification *notif)
? "normal" : "critical";
if (!spawn_expand_template(
- &term->conf->desktop_notifications.command, 7,
+ &term->conf->desktop_notifications.command, 8,
(const char *[]){
- "app-id", "window-title", "icon", "title", "body", "urgency", "action"},
+ "app-id", "window-title", "icon", "title", "body", "urgency", "action-name", "action-label"},
(const char *[]){
term->app_id ? term->app_id : term->conf->app_id,
term->window_title, icon_name_or_path, title, body, urgency_str,
- "default=Click to activate"},
+ "default", "Click to activate"},
&argc, &argv))
{
return false;
@@ -253,7 +252,7 @@ notify_notify(struct terminal *term, struct notification *notif)
notif->title = NULL;
notif->body = NULL;
notif->icon_id = NULL;
- notif->icon_symbolic_name= NULL;
+ notif->icon_symbolic_name = NULL;
notif->icon_data = NULL;
notif->icon_data_sz = 0;
notif = &tll_back(term->active_notifications);
@@ -262,7 +261,6 @@ notify_notify(struct terminal *term, struct notification *notif)
if (stdout_fds[0] >= 0) {
- xassert(notif->xdg_token == NULL);
fdm_add(term->fdm, stdout_fds[0], EPOLLIN,
&fdm_notify_stdout, (void *)term);
}