dimmus
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

efreet: Don't check if path is a subdir 

We don't recurse in extra_dirs, so we must store all paths explicit.

SVN revision: 62582
This commit is contained in:
Sebastian Dransfeld 2011-08-19 06:44:59 +00:00
parent 1210e95895
commit 6ac66e7427
2 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
legacy/efreet/src/bin/efreet_desktop_cache_create.c
View File

@ -35,12 +35,6 @@ static Eina_Hash *generic_name = NULL;
static Eina_Hash *comment = NULL;
static Eina_Hash *exec = NULL;
static int
strcmplen(const void *data1, const void *data2)
{
return strncmp(data1, data2, eina_stringshare_strlen(data1));
}
static int
cache_add(const char *path, const char *file_id, int priority __UNUSED__, int *changed)
{
@ -335,7 +329,7 @@ main(int argc, char **argv)
for (j = 0; j < user_dirs->array_count; j++)
{
if (eina_list_search_unsorted_list(scanned, strcmplen, user_dirs->array[j]))
if (eina_list_search_unsorted_list(scanned, EINA_COMPARE_CB(strcmp), user_dirs->array[j]))
continue;
if (!ecore_file_is_dir(user_dirs->array[j])) continue;
if (!cache_scan(user_dirs->array[j], NULL, priority, 0, &changed)) goto error;
@ -352,7 +346,7 @@ main(int argc, char **argv)
EINA_LIST_FOREACH(extra_dirs, l, path)
{
if (eina_list_search_unsorted_list(scanned, strcmplen, path))
if (eina_list_search_unsorted_list(scanned, EINA_COMPARE_CB(strcmp), path))
continue;
if (!ecore_file_is_dir(path)) continue;

2
legacy/efreet/src/lib/efreet_cache.c
View File

@ -926,7 +926,7 @@ efreet_cache_desktop_add(Efreet_Desktop *desktop)
for (i = 0; i < arr->array_count; i++)
{
/* Check if we already have this dir in cache */
if (!strncmp(dir, arr->array[i], strlen(arr->array[i])))
if (!strcmp(dir, arr->array[i]))
return;
}
}