enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 24 Pull Requests 2 Projects Releases Wiki Activity

Revert "Do not add /usr/share twice for XDG_DATA_DIRS" 

This reverts commit e3eda1d690.

hardcoding directory paths is not a solution that I want to see used for this issue.
(cherry picked from commit fbde0824d1)

Signed-off-by: Thanatermesis <thanatermesis@gmail.com>
This commit is contained in:
Mike Blumenkrantz 2015-01-29 12:43:20 -05:00 committed by Thanatermesis
parent 58da664ccf
commit 60b003245b
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/bin/e_main.c
View File

@ -139,13 +139,7 @@ _xdg_data_dirs_augment(void)
if (!p) return;
s = getenv("XDG_DATA_DIRS");
// if our prefix is already /usr we should not append /usr/share here yet
if (strcmp(p, "/usr") == 0)
snprintf(newpath, sizeof(newpath), "%s", e_prefix_data_get());
else
snprintf(newpath, sizeof(newpath), "%s:%s/share", e_prefix_data_get(), p);
snprintf(newpath, sizeof(newpath), "%s:%s/share", e_prefix_data_get(), p);
if (s)
{
if (strncmp(s, newpath, strlen(newpath)))