summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog1
-rw-r--r--examples/themes5
-rw-r--r--share/images/menubg_aluminium.pngbin1862 -> 0 bytes
-rw-r--r--share/images/menubg_aqua.pngbin5325 -> 0 bytes
-rw-r--r--share/images/menubg_black.pngbin1716 -> 0 bytes
-rw-r--r--share/images/menubg_brushed.pngbin8649 -> 0 bytes
-rw-r--r--share/images/menubg_sky.pngbin1928 -> 0 bytes
-rw-r--r--src/main.c1
-rw-r--r--src/menu.c2
-rw-r--r--src/options.c7
-rw-r--r--src/options.h1
11 files changed, 2 insertions, 15 deletions
diff --git a/ChangeLog b/ChangeLog
index 667d204..f2ec192 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,7 @@ git HEAD
* Remove deprecated webcam scripts (feh-cam and gen-cam-menu)
* Remove deprecated collage mode (-c/--collage)
* Remove deprecated option --cycle-once (use --on-last-slide=quit instead)
+ * Remove deprecated option --menu-bg
* flip and rotation (keys "<", ">", "|", and "_") no longer change the
underlying file. This leaves delete ("Ctrl+Delete") as the only
destructive action which is enabled by default
diff --git a/examples/themes b/examples/themes
index d315942..2d77770 100644
--- a/examples/themes
+++ b/examples/themes
@@ -41,11 +41,6 @@ booth --full-screen --hide-pointer --slideshow-delay 20
# Screw xscreensaver, use feh =)
screensave --recursive --full-screen --randomize --slideshow-delay 10 --hide-pointer
-# Different menus
-aqua --menu-bg /usr/share/feh/images/menubg_aqua.png
-sky --menu-bg /usr/share/feh/images/menubg_sky.png
-black --menu-bg /usr/share/feh/images/menubg_black.png
-
# Some more examples, used by the feh developer
rfs --full-screen --hide-pointer --auto-zoom --randomize
diff --git a/share/images/menubg_aluminium.png b/share/images/menubg_aluminium.png
deleted file mode 100644
index eed00f1..0000000
--- a/share/images/menubg_aluminium.png
+++ /dev/null
Binary files differ
diff --git a/share/images/menubg_aqua.png b/share/images/menubg_aqua.png
deleted file mode 100644
index 3a72590..0000000
--- a/share/images/menubg_aqua.png
+++ /dev/null
Binary files differ
diff --git a/share/images/menubg_black.png b/share/images/menubg_black.png
deleted file mode 100644
index 08b4c2b..0000000
--- a/share/images/menubg_black.png
+++ /dev/null
Binary files differ
diff --git a/share/images/menubg_brushed.png b/share/images/menubg_brushed.png
deleted file mode 100644
index 32fad47..0000000
--- a/share/images/menubg_brushed.png
+++ /dev/null
Binary files differ
diff --git a/share/images/menubg_sky.png b/share/images/menubg_sky.png
deleted file mode 100644
index e0be8ca..0000000
--- a/share/images/menubg_sky.png
+++ /dev/null
Binary files differ
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;