Commit 28053de1 authored by Birte Kristina Friesel's avatar Birte Kristina Friesel
Browse files

do not depend on HOME being set 

this introduces a bug in feh_wm_set_bg, which will be fixed in the next
commit (only applies when run without HOME)
parent bc13f701

src/events.c

+3 −4
Changes for src/events.c: 3 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -110,15 +110,14 @@ void init_buttonbindings(void) 
	feh_set_bb(&buttons.rotate, 4, 2);



	home = getenv("HOME");

	if (!home)

		eprintf("No HOME in environment");



	confhome = getenv("XDG_CONFIG_HOME");



	if (confhome)

		confpath = estrjoin("/", confhome, "feh/buttons", NULL);

	else

	else if (home)

		confpath = estrjoin("/", home, ".config/feh/buttons", NULL);

	else

		return;



	conf = fopen(confpath, "r");

src/keyevents.c

+3 −4
Changes for src/keyevents.c: 3 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -157,15 +157,14 @@ void init_keyevents(void) { 
	feh_set_kb(&keys.toggle_keep_vp, 0, XK_k, 0, 0, 0, 0);



	home = getenv("HOME");

	if (!home)

		eprintf("No HOME in environment");



	confhome = getenv("XDG_CONFIG_HOME");



	if (confhome)

		confpath = estrjoin("/", confhome, "feh/keys", NULL);

	else

	else if (home)

		confpath = estrjoin("/", home, ".config/feh/keys", NULL);

	else

		return;



	conf = fopen(confpath, "r");

src/options.c

+7 −6
Changes for src/options.c: 7 added lines, 6 removed lines.
Original line number Diff line number Diff line
@@ -132,15 +132,16 @@ static void feh_load_options_for_theme(char *theme) 
	int cont = 0;

	int bspos;



	if (!home)

		eprintf("You have no HOME, cannot read themes");



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



	if (confbase)

		rcpath = estrjoin("/", confbase, "feh/themes", NULL);

	else

	else if (home)

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

	else {

		weprintf("You have no HOME, cannot read configuration");

		return;

	}



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



	fp = fopen(rcpath, "r");