Commit 7b508648 authored by Birte Kristina Friesel's avatar Birte Kristina Friesel
Browse files

Read themes from ~/.config/feh/themes, don't autocreate for now

parent d2ac8a9c

src/deps.mk

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ menu.o: menu.c feh.h structs.h menu.h utils.h getopt.h debug.h support.h \ 
multiwindow.o: multiwindow.c feh.h structs.h menu.h utils.h getopt.h \

  debug.h winwidget.h timers.h filelist.h options.h

options.o: options.c feh.h structs.h menu.h utils.h getopt.h debug.h \

  filelist.h options.h help.inc fehrc.inc

  filelist.h options.h help.inc

signals.o: signals.c feh.h structs.h menu.h utils.h getopt.h debug.h \

  winwidget.h

slideshow.o: slideshow.c feh.h structs.h menu.h utils.h getopt.h debug.h \

src/options.c

+2 −23
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. 
#include "options.h"



static void check_options(void);

static void feh_create_default_config(char *rcfile);

static void feh_parse_option_array(int argc, char **argv);

static void feh_parse_environment_options(void);

static void feh_check_theme_options(int arg, char **argv);
@@ -163,14 +162,11 @@ static void feh_load_options_for_theme(char *theme) 
		if (!home)

			eprintf("D'oh! Please define HOME in your environment! "

					"It would really help me out...\n");

		rcpath = estrjoin("/", home, ".fehrc", NULL);

		rcpath = estrjoin("/", home, ".config/feh/themes", NULL);

		D(("Trying %s for config\n", rcpath));

		fp = fopen(rcpath, "r");



		if (!fp && ((fp = fopen("/etc/fehrc", "r")) == NULL)) {

			feh_create_default_config(rcpath);



			if ((fp = fopen(rcpath, "r")) == NULL)

			return;

		}
@@ -861,20 +857,3 @@ static void show_usage(void) 
	, stdout);

	exit(0);

}
 


static void feh_create_default_config(char *rcfile)

{

	FILE *fp;



	if ((fp = fopen(rcfile, "w")) == NULL) {

		weprintf("Unable to create default config file %s\n", rcfile);

		return;

	}



	fputs(

#include "fehrc.inc"

	, fp);

	fclose(fp);



	return;

}