diff options
| author | Mike Blumenkrantz <zmike@samsung.com> | 2018-06-25 13:05:34 -0400 |
|---|---|---|
| committer | Mike Blumenkrantz <zmike@samsung.com> | 2018-06-25 13:05:34 -0400 |
| commit | 301c1d6b4b366bc6bbe82c983066043ab48903f0 (patch) | |
| tree | a5f4fc378f0e4c57f997e466e7310a02ab5659fa | |
| parent | 392668bdfbd03985e7c01fba74548b9db912a16f (diff) | |
| download | efl-devs/discomfitor/simple-efreet-fix.tar.gz | |
efreet: use correct path when generating error message about stale efreetd socketdevs/discomfitor/simple-efreet-fix
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
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | src/lib/efreet/efreet_cache.c | 6 |
2 files changed, 5 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 48782e88bf..278fffe596 100644 --- a/configure.ac +++ b/configure.ac @@ -4783,6 +4783,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(); |