vtorri
/
enlightenment
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

'everything' 

- remove duplicate items (e.g. files from dirbrowse and tracker) from aggregator
- fix bugger in files plugin


SVN revision: 48304
This commit is contained in:
Hannes Janetzek 2010-04-25 12:21:41 +00:00
parent bf72bd5171
commit 493e7f900d
2 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/modules/everything-files/e_mod_main.c
View File

@ -159,8 +159,8 @@ _scan_func(void *data)
dp->d_type == DT_SOCK)
continue;
if ((d->scan_dirs && (dp->d_type != DT_DIR)) ||
(dp->d_type != DT_UNKNOWN))
if ((d->scan_dirs && (dp->d_type != DT_DIR) ||
(dp->d_type == DT_UNKNOWN)))
continue;
else if (!d->scan_dirs && (dp->d_type == DT_DIR))
continue;

28
src/modules/everything/evry_plug_aggregator.c
View File

@ -99,6 +99,18 @@ _cb_sort(const void *data1, const void *data2)
static inline Eina_List *
_add_item(Plugin *p, Eina_List *items, Evry_Item *it)
{
Eina_List *_l;
Evry_Item *_it;
/* remove duplicates provided by different plugins */
EINA_LIST_FOREACH(p->base.items, _l, _it)
{
if ((it->plugin->name != _it->plugin->name) &&
(it->plugin->type_out == _it->plugin->type_out) &&
(it->id == _it->id))
return items;
}
evry_item_ref(it);
items = eina_list_append(items, it);
EVRY_PLUGIN_ITEM_APPEND(p, it);
@ -240,22 +252,6 @@ _fetch(Evry_Plugin *plugin, const char *input)
p->base.items = eina_list_remove_list(p->base.items, l);
}
/* remove duplicates provided by different plugins */
/* EINA_LIST_FOREACH_SAFE(p->base.items, l, ll, it)
* {
* EINA_LIST_FOREACH(l->next, lll, it2)
* {
* if ((it->plugin->name != it2->plugin->name) &&
* (it->plugin->type_out == it2->plugin->type_out) &&
* (it->id == it2->id))
* {
* p->base.items = eina_list_remove_list(p->base.items, l);
* evry_item_free(it);
* break;
* }
* }
* } */
return 1;
}