From b4c2db8d05108c2902dc7b3c560f9e52d5d429c4 Mon Sep 17 00:00:00 2001
From: Mike Blumenkrantz <zmike@samsung.com>
Date: Tue, 3 Jul 2018 12:49:08 -0400
Subject: [PATCH] efreet: use correct path when generating error message about
 stale efreetd socket

Summary:
using runtime directory in all cases for this is wrong, as ecore-con has a number
of fallback codepaths for the case where runtime directory is not set or not valid.

by using the same ecore-con function which ecore-ipc uses to generate the socket
string, the error message path should always be the same as the path which is
used by efreetd

extra linkage was required by efreet in order to use ecore-con functions, so
the internal lib variable in the build system was modified to provide this

@fix

fix T7045

Reviewers: devilhorns

Reviewed By: devilhorns

Subscribers: cedric, #committers

Tags: #efl

Maniphest Tasks: T7045

Differential Revision: https://phab.enlightenment.org/D6425
---
 configure.ac                  | 1 +
 src/lib/efreet/efreet_cache.c | 6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index fa8a570447..14b940024d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4791,6 +4791,7 @@ EFL_INTERNAL_DEPEND_PKG([EFREET], [eo])
 EFL_INTERNAL_DEPEND_PKG([EFREET], [efl])
 EFL_INTERNAL_DEPEND_PKG([EFREET], [eina])
 EFL_INTERNAL_DEPEND_PKG([EFREET], [emile])
+EFL_INTERNAL_DEPEND_PKG([EFREET], [ecore-con])
 EFL_INTERNAL_DEPEND_PKG([EFREET], [ecore-ipc])
 
 ### Checks for header files
diff --git a/src/lib/efreet/efreet_cache.c b/src/lib/efreet/efreet_cache.c
index 5801509cb6..8ede4614d6 100644
--- a/src/lib/efreet/efreet_cache.c
+++ b/src/lib/efreet/efreet_cache.c
@@ -16,6 +16,7 @@
 #include <Ecore.h>
 #include <Ecore_File.h>
 #include <Ecore_Ipc.h>
+#include <Ecore_Con.h>
 
 /* define macros and variable for using the eina logging system  */
 #define EFREET_MODULE_LOG_DOM _efreet_cache_log_dom
@@ -168,9 +169,10 @@ _cb_server_del(void *data EINA_UNUSED, int type EINA_UNUSED, void *event)
    if (disable_cache) return ECORE_CALLBACK_RENEW;
    if (reconnect_count > 10)
      {
+        char *address = ecore_con_local_path_new(EINA_FALSE, "efreetd", 0);
         reconnect_timer = NULL;
-        ERR("efreetd connection failed 10 times! check for stale socket files in %s/.ecore/efreetd",
-          efreet_runtime_dir_get());
+        ERR("efreetd connection failed 10 times! check for stale socket file at %s", address);
+        free(address);
         return EINA_FALSE;
      }
    t = ecore_time_get();