From c95dd0e68581db4550beb5748511f9e4ef79b54e Mon Sep 17 00:00:00 2001 From: Lars Henriksen Date: Thu, 6 Sep 2018 23:00:59 +0200 Subject: Remove the configuraton variable conf.progress_bar When loading/saving the configuration file the entry is silently ignored (which means it is removed by the first save). Signed-off-by: Lars Henriksen Signed-off-by: Lukas Fleischer --- src/config.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'src/config.c') diff --git a/src/config.c b/src/config.c index ff66fce..9e13eaf 100644 --- a/src/config.c +++ b/src/config.c @@ -112,7 +112,6 @@ static const struct confvar confmap[] = { {"general.confirmquit", CONFIG_HANDLER_BOOL(conf.confirm_quit)}, {"general.firstdayofweek", config_parse_first_day_of_week, config_serialize_first_day_of_week, NULL}, {"general.periodicsave", CONFIG_HANDLER_UNSIGNED(conf.periodic_save)}, - {"general.progressbar", CONFIG_HANDLER_BOOL(conf.progress_bar)}, {"general.systemdialogs", CONFIG_HANDLER_BOOL(conf.system_dialogs)}, {"notification.command", CONFIG_HANDLER_STR(nbar.cmd)}, {"notification.notifyall", config_parse_notifyall, config_serialize_notifyall, NULL}, @@ -601,6 +600,12 @@ config_file_walk(config_fn_walk_cb_t fn_cb, WARN_MSG(_("Pre-3.0.0 configuration file format detected, " "please upgrade running `calcurse-upgrade`.")); } + /* + * Backwards compatibility for removed configuration options: + * ignored on load, omitted on save. + */ + if (strcmp(key, "general.progressbar") == 0) + continue; if (value && (*value == '\0' || *value == '\n')) { /* Backward compatibility mode. */ -- cgit v1.2.3-54-g00ecf