From 3f81c54fc14a8e76fd9df24ba17598750db7ca5e Mon Sep 17 00:00:00 2001 From: Hannes Janetzek Date: Tue, 18 May 2010 12:32:29 +0000 Subject: [PATCH] actually remove duplicates in aggregator SVN revision: 48976 --- src/modules/everything/evry_plug_aggregator.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/modules/everything/evry_plug_aggregator.c b/src/modules/everything/evry_plug_aggregator.c index d36265ca8..241905dc4 100644 --- a/src/modules/everything/evry_plug_aggregator.c +++ b/src/modules/everything/evry_plug_aggregator.c @@ -191,7 +191,7 @@ _fetch(Evry_Plugin *plugin, const char *input) } items = eina_list_sort(items, -1, evry_items_sort_func); - + EINA_LIST_FOREACH(items, l, it) { /* remove duplicates provided by different plugins */ @@ -202,13 +202,16 @@ _fetch(Evry_Plugin *plugin, const char *input) if ((it->plugin->name != it2->plugin->name) && (it->type == it2->type) && (it->id == it2->id)) - continue; + break; } } - evry_item_ref(it); - EVRY_PLUGIN_ITEM_APPEND(p, it); - + if (!it->id || !it2) + { + evry_item_ref(it); + EVRY_PLUGIN_ITEM_APPEND(p, it); + } + if (cnt++ > MAX_ITEMS) break;