From 816f6d2406b704769e1fb39370616aa103099715 Mon Sep 17 00:00:00 2001 From: "Carsten Haitzler (Rasterman)" Date: Wed, 20 Nov 2013 09:10:30 +0900 Subject: [PATCH] allow $XDG_DESKTOP_DIR in file link paths for intl xlation this solves T29 and then some. --- data/favorites/desktop.desktop | 2 +- src/bin/e_utils.c | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/data/favorites/desktop.desktop b/data/favorites/desktop.desktop index 3d41ba519..1b21fa305 100644 --- a/data/favorites/desktop.desktop +++ b/data/favorites/desktop.desktop @@ -20,5 +20,5 @@ Comment[ru]=Файлы на рабочем столе Comment[sr]=Датотеке радне површи Icon=user-desktop NotShowIn=GNOME;KDE;LXDE;ROX;XFCE; -URL=file:$HOME/Desktop +URL=file:$XDG_DESKTOP_DIR X-Enlightenment-Type=Mount diff --git a/src/bin/e_utils.c b/src/bin/e_utils.c index 78f2d4fbc..77faa09f1 100644 --- a/src/bin/e_utils.c +++ b/src/bin/e_utils.c @@ -796,6 +796,24 @@ e_util_shell_env_path_eval(const char *path) v = (char *)efreet_cache_home_get(); else if (!strcmp(s, "XDG_DATA_HOME")) v = (char *)efreet_data_home_get(); + else if (!strcmp(s, "XDG_DESKTOP_DIR")) + v = (char *)efreet_desktop_dir_get(); + else if (!strcmp(s, "XDG_DOWNLOAD_DIR")) + v = (char *)efreet_download_dir_get(); + else if (!strcmp(s, "XDG_TEMPLATES_DIR")) + v = (char *)efreet_templates_dir_get(); + else if (!strcmp(s, "XDG_PUBLICSHARE_DIR")) + v = (char *)efreet_public_share_dir_get(); + else if (!strcmp(s, "XDG_DOCUMENTS_DIR")) + v = (char *)efreet_documents_dir_get(); + else if (!strcmp(s, "XDG_MUSIC_DIR")) + v = (char *)efreet_music_dir_get(); + else if (!strcmp(s, "XDG_PICTURES_DIR")) + v = (char *)efreet_pictures_dir_get(); + else if (!strcmp(s, "XDG_VIDEOS_DIR")) + v = (char *)efreet_videos_dir_get(); + else if (!strcmp(s, "XDG_RUNTIME_DIR")) + v = (char *)efreet_runtime_dir_get(); } if (v)