summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Friesel <derf@finalrewind.org>2011-01-24 17:38:31 +0100
committerDaniel Friesel <derf@finalrewind.org>2011-01-24 17:38:31 +0100
commiteb266c74c86caf7bef1d02dd3ac2c5902dc98827 (patch)
tree91a80b58688fcb0b27f6c1b18cd41c1f2de8e8db
parent0863788f1c1e3d5b5a61bfe72620b542451853c9 (diff)
Remove support for FEH_OPTIONS (it was deprecated over 5 years ago)
-rw-r--r--ChangeLog1
-rw-r--r--src/options.c20
2 files changed, 1 insertions, 20 deletions
diff --git a/ChangeLog b/ChangeLog
index 2b27e11..cff4439 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,7 @@ git HEAD
* Allow commandline options to override those set in a theme
* Add --zoom fill as equivalent for --auto-zoom
* Add --zoom max (zooming like in --bg-max)
+ * Remove support for FEH_OPTIONS (was deprecated >5 years ago)
Sat, 22 Jan 2011 11:48:33 +0100
diff --git a/src/options.c b/src/options.c
index 3e2e343..78e768e 100644
--- a/src/options.c
+++ b/src/options.c
@@ -90,10 +90,6 @@ void init_parse_options(int argc, char **argv)
opt.xinerama = 1;
#endif /* HAVE_LIBXINERAMA */
- D(("About to parse env options (if any)\n"));
- /* Check for and parse any options in FEH_OPTIONS */
- feh_parse_environment_options();
-
feh_getopt_theme(argc, argv);
D(("About to check for theme configuration\n"));
@@ -225,22 +221,6 @@ static void feh_load_options_for_theme(char *theme)
return;
}
-static void feh_parse_environment_options(void)
-{
- char *opts;
-
- if ((opts = getenv("FEH_OPTIONS")) == NULL)
- return;
-
- weprintf
- ("The FEH_OPTIONS configuration method is depreciated and will soon die.\n"
- "Use the feh/themes configuration file instead.");
-
- /* We definitely have some options to parse */
- feh_parse_options_from_string(opts);
- return;
-}
-
/* FIXME This function is a crufty bitch ;) */
static void feh_parse_options_from_string(char *opts)
{