raster pushed a commit to branch master.
commit 4be1d4537aa15b35ee6be55801138d8682c4973d
Author: Carsten Haitzler (Rasterman) <[email protected]>
Date: Tue May 28 12:32:31 2013 +0900
allow xdg dir usage if you add -DDOXDG to CFLAGS.
---
src/bin/e_user.c | 29 ++++++++++++++++++++++-------
1 file changed, 22 insertions(+), 7 deletions(-)
diff --git a/src/bin/e_user.c b/src/bin/e_user.c
index 801decc..2576690 100644
--- a/src/bin/e_user.c
+++ b/src/bin/e_user.c
@@ -130,23 +130,38 @@ EAPI const char *
e_user_dir_get(void)
{
static char dir[PATH_MAX] = "";
- static char buf[PATH_MAX] = "";
if (!dir[0])
{
- char *e_home = getenv("E_HOME");
- if (e_home)
+ char *d;
+
+ if ((d = getenv("E_HOME")))
{
- snprintf(buf, sizeof(buf), "%s/e", e_home);
+ snprintf(dir, sizeof(dir), "%s/e", d);
+ _e_user_dir_len = strlen(dir);
}
else
{
- snprintf(buf, sizeof(buf), ".e/e");
+#ifdef DOXDG
+ if ((d = getenv("XDG_CONFIG_HOME")))
+ {
+ snprintf(dir, sizeof(dir), "%s/e", d);
+ _e_user_dir_len = strlen(dir);
+ }
+ else
+#endif
+ {
+#ifdef DOXDG
+ _e_user_dir_len = e_user_homedir_concat(dir, sizeof(dir),
+ ".config/e");
+#else
+ _e_user_dir_len = e_user_homedir_concat(dir, sizeof(dir),
+ ".e/e");
+#endif
+ }
}
- _e_user_dir_len = e_user_homedir_concat(dir, sizeof(dir), buf);
_e_user_dir = dir;
}
-
return dir;
}
--
------------------------------------------------------------------------------
Try New Relic Now & We'll Send You this Cool Shirt
New Relic is the only SaaS-based application performance monitoring service
that delivers powerful full stack analytics. Optimize and monitor your
browser, app, & servers with just a few lines of code. Try New Relic
and get this awesome Nerd Life shirt! http://p.sf.net/sfu/newrelic_d2d_may
