summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@samsung.com>2018-06-25 13:05:34 -0400
committerMike Blumenkrantz <zmike@samsung.com>2018-06-25 13:05:34 -0400
commit301c1d6b4b366bc6bbe82c983066043ab48903f0 (patch)
treea5f4fc378f0e4c57f997e466e7310a02ab5659fa
parent392668bdfbd03985e7c01fba74548b9db912a16f (diff)
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.ac1
-rw-r--r--src/lib/efreet/efreet_cache.c6
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])
4783EFL_INTERNAL_DEPEND_PKG([EFREET], [efl]) 4783EFL_INTERNAL_DEPEND_PKG([EFREET], [efl])
4784EFL_INTERNAL_DEPEND_PKG([EFREET], [eina]) 4784EFL_INTERNAL_DEPEND_PKG([EFREET], [eina])
4785EFL_INTERNAL_DEPEND_PKG([EFREET], [emile]) 4785EFL_INTERNAL_DEPEND_PKG([EFREET], [emile])
4786EFL_INTERNAL_DEPEND_PKG([EFREET], [ecore-con])
4786EFL_INTERNAL_DEPEND_PKG([EFREET], [ecore-ipc]) 4787EFL_INTERNAL_DEPEND_PKG([EFREET], [ecore-ipc])
4787 4788
4788### Checks for header files 4789### 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 @@
16#include <Ecore.h> 16#include <Ecore.h>
17#include <Ecore_File.h> 17#include <Ecore_File.h>
18#include <Ecore_Ipc.h> 18#include <Ecore_Ipc.h>
19#include <Ecore_Con.h>
19 20
20/* define macros and variable for using the eina logging system */ 21/* define macros and variable for using the eina logging system */
21#define EFREET_MODULE_LOG_DOM _efreet_cache_log_dom 22#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)
168 if (disable_cache) return ECORE_CALLBACK_RENEW; 169 if (disable_cache) return ECORE_CALLBACK_RENEW;
169 if (reconnect_count > 10) 170 if (reconnect_count > 10)
170 { 171 {
172 char *address = ecore_con_local_path_new(EINA_FALSE, "efreetd", 0);
171 reconnect_timer = NULL; 173 reconnect_timer = NULL;
172 ERR("efreetd connection failed 10 times! check for stale socket files in %s/.ecore/efreetd", 174 ERR("efreetd connection failed 10 times! check for stale socket file at %s", address);
173 efreet_runtime_dir_get()); 175 free(address);
174 return EINA_FALSE; 176 return EINA_FALSE;
175 } 177 }
176 t = ecore_time_get(); 178 t = ecore_time_get();