diff options
| author | Dennis Real <github@tildepipe.org> | 2012-05-26 10:54:37 +0200 |
|---|---|---|
| committer | Dennis Real <github@tildepipe.org> | 2012-05-26 10:54:37 +0200 |
| commit | 50676a24151060a314d80b2413ae9784ea8433aa (patch) | |
| tree | fbbfbc5ccc3c2b82e5ff3775f6e7c5c4d4a60ffe /src/options.c | |
| parent | bb3907288a3681689f903cc7cd264ea6a1e6da39 (diff) | |
| parent | 20bdcb57e7ec209b5c13f72b2cec0c7f1c76a5ac (diff) | |
Merge branch 'master' of git://github.com/derf/feh
Diffstat (limited to 'src/options.c')
| -rw-r--r-- | src/options.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/src/options.c b/src/options.c index 0d4d745..c27e11e 100644 --- a/src/options.c +++ b/src/options.c @@ -60,7 +60,6 @@ void init_parse_options(int argc, char **argv) opt.menu_font = estrdup(DEFAULT_MENU_FONT); opt.font = NULL; opt.menu_bg = estrdup(PREFIX "/share/feh/images/menubg_default.png"); - opt.menu_style = estrdup(PREFIX "/share/feh/fonts/menu.style"); opt.start_list_at = NULL; opt.jump_on_resort = 1; @@ -375,7 +374,6 @@ static void feh_parse_option_array(int argc, char **argv, int finalrun) {"bg-tile" , 0, 0, 200}, {"bg-center" , 0, 0, 201}, {"bg-scale" , 0, 0, 202}, - {"menu-style" , 1, 0, 204}, {"zoom" , 1, 0, 205}, {"no-screen-clip", 0, 0, 206}, {"index-info" , 1, 0, 207}, @@ -629,11 +627,6 @@ static void feh_parse_option_array(int argc, char **argv, int finalrun) case 219: opt.bgmode = BG_MODE_MAX; break; - case 204: - free(opt.menu_style); - opt.menu_style = estrdup(optarg); - weprintf("The --menu-style option is deprecated and will be removed by 2012"); - break; case 205: if (!strcmp("fill", optarg)) opt.zoom_mode = ZOOM_MODE_FILL; |