thanatermesis pushed a commit to branch enlightenment-0.18.

http://git.enlightenment.org/core/enlightenment.git/commit/?id=325eaf76a7e52651002826c75ffdb98dcf8d2247

commit 325eaf76a7e52651002826c75ffdb98dcf8d2247
Author: Sebastian Dransfeld <[email protected]>
Date:   Wed Jun 11 11:18:54 2014 +0200

    e-xdg: augment XDG_CONFIG_DIRS as well
    (cherry picked from commit 2247fab47294a12feb0d835e11ec8d26518d417c)
    
    Signed-off-by: Thanatermesis <[email protected]>
---
 src/bin/e_main.c | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/bin/e_main.c b/src/bin/e_main.c
index 005a80f..29f7eea 100644
--- a/src/bin/e_main.c
+++ b/src/bin/e_main.c
@@ -118,12 +118,13 @@ EAPI Eina_Bool e_nopause = EINA_FALSE;
 static void
 _xdg_data_dirs_augment(void)
 {
-   const char *s = getenv("XDG_DATA_DIRS");
+   const char *s;
    const char *p = e_prefix_get();
    char newpath[4096], buf[4096];
 
    if (!p) return;
 
+   s = getenv("XDG_DATA_DIRS");
    snprintf(newpath, sizeof(newpath), "%s:%s/share", e_prefix_data_get(), p);
    if (s)
      {
@@ -139,6 +140,22 @@ _xdg_data_dirs_augment(void)
         e_util_env_set("XDG_DATA_DIRS", buf);
      }
 
+   s = getenv("XDG_CONFIG_DIRS");
+   snprintf(newpath, sizeof(newpath), "%s/etc/xdg", p);
+   if (s)
+     {
+        if (strncmp(s, newpath, strlen(newpath)))
+          {
+             snprintf(buf, sizeof(buf), "%s:%s", newpath, s);
+             e_util_env_set("XDG_CONFIG_DIRS", buf);
+          }
+     }
+   else
+     {
+        snprintf(buf, sizeof(buf), "%s:/etc/xdg", newpath);
+        e_util_env_set("XDG_CONFIG_DIRS", buf);
+     }
+
    if (!getenv("XDG_RUNTIME_DIR"))
      {
         const char *dir;

-- 


Reply via email to