forked from enlightenment/efl
parent
fc031b899d
commit
f7b9de9595
|
@ -246,16 +246,16 @@ efreet_dirs_get(const char *key, const char *fallback)
|
||||||
{
|
{
|
||||||
*p = '\0';
|
*p = '\0';
|
||||||
if (!eina_list_search_unsorted(dirs, EINA_COMPARE_CB(strcmp), s))
|
if (!eina_list_search_unsorted(dirs, EINA_COMPARE_CB(strcmp), s))
|
||||||
{
|
{
|
||||||
// resolve path properly/fully to remove path//path2 to
|
// resolve path properly/fully to remove path//path2 to
|
||||||
// path/path2, path/./path2 to path/path2 etc.
|
// path/path2, path/./path2 to path/path2 etc.
|
||||||
char *ts = ecore_file_realpath(s);
|
char *ts = ecore_file_realpath(s);
|
||||||
if (ts)
|
if (ts)
|
||||||
{
|
{
|
||||||
dirs = eina_list_append(dirs, (void *)eina_stringshare_add(ts));
|
dirs = eina_list_append(dirs, (void *)eina_stringshare_add(ts));
|
||||||
free(ts);
|
free(ts);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
s = ++p;
|
s = ++p;
|
||||||
p = strchr(s, EFREET_PATH_SEP);
|
p = strchr(s, EFREET_PATH_SEP);
|
||||||
|
|
|
@ -19,7 +19,7 @@
|
||||||
|
|
||||||
/* define macros and variable for using the eina logging system */
|
/* define macros and variable for using the eina logging system */
|
||||||
|
|
||||||
#ifdef EFREET_MODULE_LOG_DOM
|
#ifdef EFREET_MODULE_LOG_DOM
|
||||||
#undef EFREET_MODULE_LOG_DOM
|
#undef EFREET_MODULE_LOG_DOM
|
||||||
#endif
|
#endif
|
||||||
#define EFREET_MODULE_LOG_DOM _efreet_utils_log_dom
|
#define EFREET_MODULE_LOG_DOM _efreet_utils_log_dom
|
||||||
|
@ -63,7 +63,7 @@ int
|
||||||
efreet_util_shutdown(void)
|
efreet_util_shutdown(void)
|
||||||
{
|
{
|
||||||
if (--init) return init;
|
if (--init) return init;
|
||||||
|
|
||||||
eina_log_domain_unregister(_efreet_utils_log_dom);
|
eina_log_domain_unregister(_efreet_utils_log_dom);
|
||||||
IF_FREE_HASH(file_id_by_desktop_path);
|
IF_FREE_HASH(file_id_by_desktop_path);
|
||||||
if (cache) eet_close(cache);
|
if (cache) eet_close(cache);
|
||||||
|
@ -130,7 +130,7 @@ efreet_util_path_to_file_id(const char *path)
|
||||||
const char *file_id;
|
const char *file_id;
|
||||||
|
|
||||||
/* TODO: Check if searching in cache is fast enough */
|
/* TODO: Check if searching in cache is fast enough */
|
||||||
if (!path) return NULL;
|
if (!path) return NULL;
|
||||||
file_id = eina_hash_find(file_id_by_desktop_path, path);
|
file_id = eina_hash_find(file_id_by_desktop_path, path);
|
||||||
if (file_id) return file_id;
|
if (file_id) return file_id;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue