englebass pushed a commit to branch master.
commit ebcd97cc938851352642eb42e3c5bc43ee288631
Author: Sebastian Dransfeld <[email protected]>
Date: Fri Jun 21 10:00:20 2013 +0200
efreet: Create cache dir in efreet_cache_init
efreetd used efreet functions before efreet init which fails.
---
src/bin/efreet/efreetd_cache.c | 8 --------
src/lib/efreet/efreet_cache.c | 9 +++++++++
2 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/src/bin/efreet/efreetd_cache.c b/src/bin/efreet/efreetd_cache.c
index c286b13..23ff1ab 100644
--- a/src/bin/efreet/efreetd_cache.c
+++ b/src/bin/efreet/efreetd_cache.c
@@ -494,7 +494,6 @@ Eina_Bool
cache_init(void)
{
char **argv;
- char buf[PATH_MAX];
ecore_app_args_get(NULL, &argv);
@@ -505,13 +504,6 @@ cache_init(void)
PACKAGE_DATA_DIR,
PACKAGE_DATA_DIR);
- snprintf(buf, sizeof(buf), "%s/efreet", efreet_cache_home_get());
- if (!ecore_file_mkpath(buf))
- {
- ERR("Failed to create directory '%s'", buf);
- goto error;
- }
-
cache_exe_del_handler = ecore_event_handler_add(ECORE_EXE_EVENT_DEL,
cache_exe_del_cb, NULL);
if (!cache_exe_del_handler)
diff --git a/src/lib/efreet/efreet_cache.c b/src/lib/efreet/efreet_cache.c
index 8af3780..9c2eaf6 100644
--- a/src/lib/efreet/efreet_cache.c
+++ b/src/lib/efreet/efreet_cache.c
@@ -111,6 +111,8 @@ EAPI int EFREET_EVENT_DESKTOP_CACHE_BUILD = 0;
int
efreet_cache_init(void)
{
+ char buf[PATH_MAX];
+
_efreet_cache_log_dom = eina_log_domain_register("efreet_cache",
EFREET_DEFAULT_LOG_COLOR);
if (_efreet_cache_log_dom < 0)
return 0;
@@ -121,6 +123,13 @@ efreet_cache_init(void)
goto error;
}
+ snprintf(buf, sizeof(buf), "%s/efreet", efreet_cache_home_get());
+ if (!ecore_file_mkpath(buf))
+ {
+ ERR("Failed to create directory '%s'", buf);
+ }
+
+
EFREET_EVENT_ICON_CACHE_UPDATE = ecore_event_type_new();
EFREET_EVENT_DESKTOP_CACHE_UPDATE = ecore_event_type_new();
EFREET_EVENT_DESKTOP_CACHE_BUILD = ecore_event_type_new();
--
------------------------------------------------------------------------------
This SF.net email is sponsored by Windows:
Build for Windows Store.
http://p.sf.net/sfu/windows-dev2dev