From 62d0331156461884fdf8d5fdcaedc96ba6de774e Mon Sep 17 00:00:00 2001 From: Daniel Friesel Date: Wed, 27 Apr 2011 07:55:56 +0200 Subject: Deprecate --menu-bg option (closes #27) --- ChangeLog | 5 ++++- man/feh.pre | 6 ------ src/help.raw | 1 - src/options.c | 3 ++- 4 files changed, 6 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2821e58..4788a04 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,10 @@ git HEAD - * Only create caption directory when actually writing out a caption + * Only create caption directory when actually writing out a caption. + * The --menu-bg option has been deprecated. It will be removed along with + --menu-style by the end of 2012. + Sat, 23 Apr 2011 22:00:27 +0200 Daniel Friesel diff --git a/man/feh.pre b/man/feh.pre index 813be8e..e2fda9f 100644 --- a/man/feh.pre +++ b/man/feh.pre @@ -311,12 +311,6 @@ size/resolution/type etc. Don't display images. Just print out their names if imlib2 can successfully load them. . -.It Cm -) , --menu-bg Ar file -. -Use -.Ar file -as background image in menus. -. .It Cm -M , --menu-font Ar font . Use diff --git a/src/help.raw b/src/help.raw index 93d636f..bbe5e37 100644 --- a/src/help.raw +++ b/src/help.raw @@ -77,7 +77,6 @@ OPTIONS -C, --fontpath PATH Specify an extra directory to look in for fonts, can be used multiple times to add multiple paths. -M, --menu-font FONT Use FONT for the font in menus. - -), --menu-bg BG Use BG for the background image in menus. -B, --image-bg STYLE Set background for transparent images and the like. Accepted values: white, black, default -N, --no-menus Don't load or show any menus. diff --git a/src/options.c b/src/options.c index e7be48e..de72429 100644 --- a/src/options.c +++ b/src/options.c @@ -607,6 +607,7 @@ static void feh_parse_option_array(int argc, char **argv, int finalrun) 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 'B': free(opt.image_bg); @@ -688,7 +689,7 @@ static void feh_parse_option_array(int argc, char **argv, int finalrun) case 204: free(opt.menu_style); opt.menu_style = estrdup(optarg); - weprintf("--menu-style is deprecated and will be removed soon"); + weprintf("The --menu-style option is deprecated and will be removed by 2012"); break; case 205: if (!strcmp("fill", optarg)) -- cgit v1.2.3