From 7b873e26ed203365e9d96760b0ad5a3605574550 Mon Sep 17 00:00:00 2001
From: Daniel Friesel <derf@finalrewind.org>
Date: Mon, 5 Nov 2018 19:51:57 +0100
Subject: Remove deprecated option --menu-bg

---
 src/main.c    | 1 -
 src/menu.c    | 2 +-
 src/options.c | 7 -------
 src/options.h | 1 -
 4 files changed, 1 insertion(+), 10 deletions(-)

(limited to 'src')

diff --git a/src/main.c b/src/main.c
index 0d1cc4d..ded0b22 100644
--- a/src/main.c
+++ b/src/main.c
@@ -216,7 +216,6 @@ void feh_clean_exit(void)
 {
 	delete_rm_files();
 
-	free(opt.menu_bg);
 	free(opt.menu_font);
 
 	if(disp)
diff --git a/src/menu.c b/src/menu.c
index 2f8875d..fcbb490 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -134,7 +134,7 @@ feh_menu *feh_menu_new(void)
 	menus = l;
 
 	if (!bg) {
-		feh_load_image_char(&bg, opt.menu_bg);
+		feh_load_image_char(&bg, PREFIX "/share/feh/images/menubg_default.png");
 		if (bg) {
 			border.left = border.right = border.top = border.bottom
 				= 4;
diff --git a/src/options.c b/src/options.c
index 298dbab..c6165ac 100644
--- a/src/options.c
+++ b/src/options.c
@@ -62,7 +62,6 @@ void init_parse_options(int argc, char **argv)
 	opt.scroll_step = 20;
 	opt.menu_font = estrdup(DEFAULT_MENU_FONT);
 	opt.font = NULL;
-	opt.menu_bg = estrdup(PREFIX "/share/feh/images/menubg_default.png");
 	opt.max_height = opt.max_width = UINT_MAX;
 
 	opt.start_list_at = NULL;
@@ -319,7 +318,6 @@ static void feh_parse_option_array(int argc, char **argv, int finalrun)
 
 	/* (*name, has_arg, *flag, val) See: struct option in getopts.h */
 	static struct option lopts[] = {
-		{"menu-bg"       , 1, 0, ')'},
 		{"debug"         , 0, 0, '+'},
 		{"scale-down"    , 0, 0, '.'},
 		{"max-dimension" , 1, 0, '<'},
@@ -427,11 +425,6 @@ static void feh_parse_option_array(int argc, char **argv, int finalrun)
 		switch (optch) {
 		case 0:
 			break;
-		case ')':
-			free(opt.menu_bg);
-			opt.menu_bg = estrdup(optarg);
-			weprintf("The --menu-bg option is deprecated and will be removed by 2012");
-			break;
 		case '+':
 			opt.debug = 1;
 			break;
diff --git a/src/options.h b/src/options.h
index 1c68fa0..7f8fe9c 100644
--- a/src/options.h
+++ b/src/options.h
@@ -96,7 +96,6 @@ struct __fehoptions {
 	char *filelistfile;
 	char *menu_font;
 	char *customlist;
-	char *menu_bg;
 	char *caption_path;
 	char *start_list_at;
 	char *info_cmd;
-- 
cgit v1.2.3