From 4fbaaca0d6096c1a5edd16138e5a8f9e82e99c08 Mon Sep 17 00:00:00 2001 From: Yuxuan Shui Date: Mon, 24 Jan 2022 18:40:39 +0000 Subject: [PATCH] Remove error message for no-dock-shadow and no-dnd-shadow Deprecated since v4. Signed-off-by: Yuxuan Shui --- src/config_libconfig.c | 12 ------------ src/options.c | 10 ---------- 2 files changed, 22 deletions(-) diff --git a/src/config_libconfig.c b/src/config_libconfig.c index 417a5d0..e8eeb4b 100644 --- a/src/config_libconfig.c +++ b/src/config_libconfig.c @@ -392,18 +392,6 @@ char *parse_config_libconfig(options_t *opt, const char *config_file, bool *shad // -c (shadow_enable) if (config_lookup_bool(&cfg, "shadow", &ival)) *shadow_enable = ival; - // -C (no_dock_shadow) - if (config_lookup_bool(&cfg, "no-dock-shadow", &ival)) { - log_error("Option `no-dock-shadow` has been removed. Please use the " - "wintype option `shadow` of `dock` instead."); - goto err; - } - // -G (no_dnd_shadow) - if (config_lookup_bool(&cfg, "no-dnd-shadow", &ival)) { - log_error("Option `no-dnd-shadow` has been removed. Please use the " - "wintype option `shadow` of `dnd` instead."); - goto err; - }; // -m (menu_opacity) if (config_lookup_float(&cfg, "menu-opacity", &dval)) { log_warn("Option `menu-opacity` is deprecated, and will be removed." diff --git a/src/options.c b/src/options.c index 5ab443f..b5868d9 100644 --- a/src/options.c +++ b/src/options.c @@ -365,13 +365,11 @@ static const struct option longopts[] = { {"fade-delta", required_argument, NULL, 'D'}, {"menu-opacity", required_argument, NULL, 'm'}, {"shadow", no_argument, NULL, 'c'}, - {"no-dock-shadow", no_argument, NULL, 'C'}, {"clear-shadow", no_argument, NULL, 'z'}, {"fading", no_argument, NULL, 'f'}, {"inactive-opacity", required_argument, NULL, 'i'}, {"frame-opacity", required_argument, NULL, 'e'}, {"daemon", no_argument, NULL, 'b'}, - {"no-dnd-shadow", no_argument, NULL, 'G'}, {"shadow-red", required_argument, NULL, 257}, {"shadow-green", required_argument, NULL, 258}, {"shadow-blue", required_argument, NULL, 259}, @@ -557,14 +555,6 @@ bool get_cfg(options_t *opt, int argc, char *const *argv, bool shadow_enable, case 'I': opt->fade_in_step = normalize_d(atof(optarg)); break; case 'O': opt->fade_out_step = normalize_d(atof(optarg)); break; case 'c': shadow_enable = true; break; - case 'C': - log_error("Option `--no-dock-shadow`/`-C` has been removed. Please" - " use the wintype option `shadow` of `dock` instead."); - failed = true; break; - case 'G': - log_error("Option `--no-dnd-shadow`/`-G` has been removed. Please " - "use the wintype option `shadow` of `dnd` instead."); - failed = true; break; case 'm':; double tmp; tmp = normalize_d(atof(optarg));