3 files changed, 12 insertions, 32 deletions

diff --git a/src/lib/efreet/efreet_base.c b/src/lib/efreet/efreet_base.c
index 506d2e89a4..d510cde10e 100644
--- a/src/lib/efreet/efreet_base.c
+++ b/src/lib/efreet/efreet_base.c
@@ -311,9 +311,8 @@ efreet_dirs_init(void)
 #endif
 
     /* xdg_runtime_dir */
-    file_obj = efl_vpath_manager_fetch(EFL_VPATH_MANAGER_CLASS, "(:run:)/");
-    efl_vpath_file_do(file_obj);
-    efl_vpath_file_wait(file_obj);
+    file_obj = efl_vpath_manager_fetch(EFL_VPATH_MANAGER_CLASS,
+                                       "(:run:)/");
     xdg_runtime_dir = eina_stringshare_add(efl_vpath_file_result_get(file_obj));
     efl_del(file_obj);
 
diff --git a/src/lib/elementary/elm_config.c b/src/lib/elementary/elm_config.c
index 58dd95e9e8..48330cdfcf 100644
--- a/src/lib/elementary/elm_config.c
+++ b/src/lib/elementary/elm_config.c
@@ -615,9 +615,6 @@ _elm_config_user_dir_snprintf(char       *dst,
    va_list ap;
    Efl_Vpath_File *file_obj;
    static int use_xdg_config = -1;
-   const char elmdir[] = "elementary";
-   const char elmdotdir[] = ".elementary";
-   const char *path = NULL;
 
    if (use_xdg_config == -1)
      {
@@ -625,26 +622,15 @@ _elm_config_user_dir_snprintf(char       *dst,
         else use_xdg_config = 0;
      }
    if (use_xdg_config)
-     {
-        file_obj = efl_vpath_manager_fetch(EFL_VPATH_MANAGER_CLASS, "(:config:)/");
-        efl_vpath_file_do(file_obj);
-        efl_vpath_file_wait(file_obj);
-        path = efl_vpath_file_result_get(file_obj);
-        user_dir_len = eina_str_join_len
-          (dst, size, '/', path, strlen(path) - 1, elmdir, sizeof(elmdir) - 1);
-        efl_del(file_obj);
-     }
+     file_obj = efl_vpath_manager_fetch(EFL_VPATH_MANAGER_CLASS,
+                                        "(:config:)/elementary");
    else
-     {
-        file_obj = efl_vpath_manager_fetch(EFL_VPATH_MANAGER_CLASS, "(:home:)/");
-        efl_vpath_file_do(file_obj);
-        efl_vpath_file_wait(file_obj);
-        path = efl_vpath_file_result_get(file_obj);
-        user_dir_len = eina_str_join_len
-          (dst, size, '/', path, strlen(path) - 1, elmdotdir, sizeof(elmdotdir) - 1);
-        efl_del(file_obj);
-     }
+     file_obj = efl_vpath_manager_fetch(EFL_VPATH_MANAGER_CLASS,
+                                        "(:home:)/.elementary");
+   eina_strlcpy(dst, efl_vpath_file_result_get(file_obj), size);
+   efl_del(file_obj);
 
+   user_dir_len = strlen(dst);
    off = user_dir_len + 1;
    if (off >= size) return off;
    dst[user_dir_len] = '/';
diff --git a/src/lib/elput/elput_evdev.c b/src/lib/elput/elput_evdev.c
index 8067f24783..e29600ce50 100644
--- a/src/lib/elput/elput_evdev.c
+++ b/src/lib/elput/elput_evdev.c
@@ -60,21 +60,16 @@ _keyboard_modifiers_update(Elput_Keyboard *kbd, Elput_Seat *seat)
 static int
 _keyboard_fd_get(off_t size)
 {
-   const char *path;
    Eina_Tmpstr *fullname;
    long flags;
    int fd = 0;
-   char tmp[PATH_MAX];
    Efl_Vpath_File *file_obj;
 
-   file_obj = efl_vpath_manager_fetch(EFL_VPATH_MANAGER_CLASS, "(:run:)/");
-   efl_vpath_file_do(file_obj);
-   efl_vpath_file_wait(file_obj);
-   path = efl_vpath_file_result_get(file_obj);
-   snprintf(tmp, sizeof(tmp), "%s/elput-keymap-XXXXXX", path);
+   file_obj = efl_vpath_manager_fetch(EFL_VPATH_MANAGER_CLASS,
+                                      "(:run:)/elput-keymap-XXXXXX");
+   fd = eina_file_mkstemp(efl_vpath_file_result_get(file_obj), &fullname);
    efl_del(file_obj);
 
-   fd = eina_file_mkstemp(tmp, &fullname);
    if (fd < 0) return -1;
 
    flags = fcntl(fd, F_GETFD);