config: remove deprecated option 'utempter'

This commit is contained in:
Daniel Eklöf 2023-07-31 16:28:07 +02:00
parent 0b4f1b4af2
commit ddcbf2a7b4
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
3 changed files with 5 additions and 18 deletions

View file

@ -50,6 +50,10 @@
### Changed
### Deprecated
### Removed
* `utempter` config (was deprecated in 1.15.0).
### Fixed
* `-f,--font` command line option not affecting `csd.font` (if unset).

View file

@ -1000,23 +1000,7 @@ parse_section_main(struct context *ctx)
else if (strcmp(key, "box-drawings-uses-font-glyphs") == 0)
return value_to_bool(ctx, &conf->box_drawings_uses_font_glyphs);
else if (strcmp(key, "utmp-helper") == 0 || strcmp(key, "utempter") == 0) {
if (strcmp(key, "utempter") == 0) {
struct user_notification deprecation = {
.kind = USER_NOTIFICATION_DEPRECATED,
.text = xasprintf(
"%s:%d: \033[1m[main].utempter\033[22m, "
"use \033[1m[main].utmp-helper\033[22m instead",
ctx->path, ctx->lineno),
};
tll_push_back(conf->notifications, deprecation);
LOG_WARN(
"%s:%d: [main].utempter is deprecated, "
"use [main].utmp-helper instead",
ctx->path, ctx->lineno);
}
else if (strcmp(key, "utmp-helper") == 0) {
if (!value_to_str(ctx, &conf->utmp_helper_path))
return false;

View file

@ -502,7 +502,6 @@ test_section_main(void)
test_string(&ctx, &parse_section_main, "shell", &conf.shell);
test_string(&ctx, &parse_section_main, "term", &conf.term);
test_string(&ctx, &parse_section_main, "app-id", &conf.app_id);
test_string(&ctx, &parse_section_main, "utempter", &conf.utmp_helper_path);
test_string(&ctx, &parse_section_main, "utmp-helper", &conf.utmp_helper_path);
test_c32string(&ctx, &parse_section_main, "word-delimiters", &conf.word_delimiters);