config: remove deprecated options 'notify' and 'notify-focus-inhibit'

They've been deprecated since 1.18.0
This commit is contained in:
Daniel Eklöf 2025-03-17 12:02:57 +01:00
parent 7dbfdc73b6
commit d2ede697f9
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
3 changed files with 2 additions and 27 deletions

View file

@ -112,6 +112,8 @@
* `url.uri-characters` and `url.protocols`. Both options have been
replaced by `url.regex`.
* `notify` option (has been deprecated since 1.18.0).
* `notify-focus-inhibit` option (has been deprecated since 1.18.0).
### Fixed

View file

@ -1058,30 +1058,6 @@ parse_section_main(struct context *ctx)
else if (streq(key, "word-delimiters"))
return value_to_wchars(ctx, &conf->word_delimiters);
else if (streq(key, "notify")) {
user_notification_add(
&conf->notifications, USER_NOTIFICATION_DEPRECATED,
xstrdup("notify: use desktop-notifications.command instead"));
log_msg(
LOG_CLASS_WARNING, LOG_MODULE, __FILE__, __LINE__,
"deprecated: notify: use desktop-notifications.command instead");
return value_to_spawn_template(
ctx, &conf->desktop_notifications.command);
}
else if (streq(key, "notify-focus-inhibit")) {
user_notification_add(
&conf->notifications, USER_NOTIFICATION_DEPRECATED,
xstrdup("notify-focus-inhibit: "
"use desktop-notifications.inhibit-when-focused instead"));
log_msg(
LOG_CLASS_WARNING, LOG_MODULE, __FILE__, __LINE__,
"deprecrated: notify-focus-inhibit: "
"use desktop-notifications.inhibit-when-focused instead");
return value_to_bool(
ctx, &conf->desktop_notifications.inhibit_when_focused);
}
else if (streq(key, "selection-target")) {
_Static_assert(sizeof(conf->selection_target) == sizeof(int),
"enum is not 32-bit");

View file

@ -467,7 +467,6 @@ test_section_main(void)
test_boolean(&ctx, &parse_section_main, "login-shell", &conf.login_shell);
test_boolean(&ctx, &parse_section_main, "box-drawings-uses-font-glyphs", &conf.box_drawings_uses_font_glyphs);
test_boolean(&ctx, &parse_section_main, "locked-title", &conf.locked_title);
test_boolean(&ctx, &parse_section_main, "notify-focus-inhibit", &conf.desktop_notifications.inhibit_when_focused); /* Deprecated */
test_boolean(&ctx, &parse_section_main, "dpi-aware", &conf.dpi_aware);
test_pt_or_px(&ctx, &parse_section_main, "font-size-adjustment", &conf.font_size_adjustment.pt_or_px); /* TODO: test N% values too */
@ -481,8 +480,6 @@ test_section_main(void)
test_uint16(&ctx, &parse_section_main, "resize-delay-ms", &conf.resize_delay_ms);
test_uint16(&ctx, &parse_section_main, "workers", &conf.render_worker_count);
test_spawn_template(&ctx, &parse_section_main, "notify", &conf.desktop_notifications.command); /* Deprecated */
test_enum(&ctx, &parse_section_main, "selection-target",
4,
(const char *[]){"none", "primary", "clipboard", "both"},