Commit eb266c74 authored by Birte Kristina Friesel's avatar Birte Kristina Friesel
Browse files

Remove support for FEH_OPTIONS (it was deprecated over 5 years ago)

parent 0863788f

ChangeLog

+1 −0
Original line number Diff line number Diff line
@@ -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

src/options.c

+0 −20
Original line number Diff line number Diff line
@@ -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)

{