diff --git a/CHANGELOG.md b/CHANGELOG.md index ad90b71b..0142a6eb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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). diff --git a/config.c b/config.c index 302e30f0..129fe99a 100644 --- a/config.c +++ b/config.c @@ -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; diff --git a/tests/test-config.c b/tests/test-config.c index 2ae891e8..666f4689 100644 --- a/tests/test-config.c +++ b/tests/test-config.c @@ -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);