enlightenment/ephoto
enlightenment
/
ephoto
7
0
Fork 3
Code Issues 3 Pull Requests Projects Releases Wiki Activity

Ephoto: Update thumb dir to be .cache/ephoto/thumbnails/ ... Config: Use XDG_CONFIG_HOME if available, else use HOME/.config

This commit is contained in:
Stephen okra Houston 2016-08-29 13:56:29 -05:00
parent 5d94c9529a
commit ebc6664b66
3 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/bin/ephoto_config.c
View File

@ -621,9 +621,13 @@ static int
_ephoto_config_load(Ephoto *ephoto) _ephoto_config_load(Ephoto *ephoto)
{ {
Eet_File *ef; Eet_File *ef;
char buf[4096], buf2[4096]; char buf[4096], buf2[4096], xdg[4096];
snprintf(buf2, sizeof(buf2), "%s/.config/ephoto", getenv("HOME")); snprintf(xdg, PATH_MAX, "%s", getenv("XDG_CONFIG_HOME"));
if (strlen(xdg))
snprintf(buf2, sizeof(buf2), "%s/ephoto", xdg);
else
snprintf(buf2, sizeof(buf2), "%s/.config/ephoto", getenv("HOME"));
ecore_file_mkpath(buf2); ecore_file_mkpath(buf2);
snprintf(buf, sizeof(buf), "%s/ephoto.cfg", buf2); snprintf(buf, sizeof(buf), "%s/ephoto.cfg", buf2);
@ -660,9 +664,13 @@ _ephoto_on_config_save(void *data)
{ {
Ephoto *ephoto = data; Ephoto *ephoto = data;
Eet_File *ef; Eet_File *ef;
char buf[4096], buf2[4096]; char buf[4096], buf2[4096], xdg[4096];
snprintf(buf, sizeof(buf), "%s/.config/ephoto/ephoto.cfg", getenv("HOME")); snprintf(xdg, PATH_MAX, "%s", getenv("XDG_CONFIG_HOME"));
if (strlen(xdg))
snprintf(buf, sizeof(buf), "%s/ephoto/ephoto.cfg", xdg);
else
snprintf(buf, sizeof(buf), "%s/.config/ephoto/ephoto.cfg", getenv("HOME"));
snprintf(buf2, sizeof(buf2), "%s.tmp", buf); snprintf(buf2, sizeof(buf2), "%s.tmp", buf);
ef = eet_open(buf2, EET_FILE_MODE_WRITE); ef = eet_open(buf2, EET_FILE_MODE_WRITE);

2
src/bin/ephoto_single_browser.c
View File

@ -1870,7 +1870,7 @@ _ephoto_main_edit_menu(Ephoto_Single_Browser *sb)
Evas_Coord x, y; Evas_Coord x, y;
evas_pointer_canvas_xy_get(evas_object_evas_get(sb->main), &x, &y); evas_pointer_canvas_xy_get(evas_object_evas_get(sb->main), &x, &y);
menu = elm_menu_add(sb->main); menu = elm_menu_add(sb->ephoto->win);
elm_menu_move(menu, x, y); elm_menu_move(menu, x, y);
_add_edit_menu_items(sb, menu); _add_edit_menu_items(sb, menu);

2
src/bin/ephoto_thumbnailer.c
View File

@ -88,7 +88,7 @@ main(int argc,
ecore_file_init(); ecore_file_init();
ecore_ipc_init(); ecore_ipc_init();
snprintf(_thumbdir, PATH_MAX, "%s/.thumbnails", getenv("HOME")); snprintf(_thumbdir, PATH_MAX, "%s/cache/ephoto/.thumbnails", getenv("HOME"));
ecore_file_mkpath(_thumbdir); ecore_file_mkpath(_thumbdir);
if (_e_ipc_init()) ecore_main_loop_begin(); if (_e_ipc_init()) ecore_main_loop_begin();