From: Enlightenment S. <no-...@en...> - 2010-04-24 12:10:26
|
Log: 'everything' fix aggregator, comments Author: jeffdameth Date: 2010-04-24 05:10:19 -0700 (Sat, 24 Apr 2010) New Revision: 48269 Modified: trunk/e/src/modules/everything/evry_plug_aggregator.c Modified: trunk/e/src/modules/everything/evry_plug_aggregator.c =================================================================== --- trunk/e/src/modules/everything/evry_plug_aggregator.c 2010-04-24 02:11:14 UTC (rev 48268) +++ trunk/e/src/modules/everything/evry_plug_aggregator.c 2010-04-24 12:10:19 UTC (rev 48269) @@ -130,14 +130,14 @@ /* get current 'context' ... */ for (i = 1; i < 3; i++) { - Evry_Item *item; if (p->selector == selectors[i]) { - item = selectors[i-1]->state->cur_item; - context = item->context; + it = selectors[i-1]->state->cur_item; + if (it) context = it->context; } } + /* skip aggregator */ if (eina_list_data_find_list(s->cur_plugins, plugin)) lp = s->cur_plugins->next; else @@ -146,6 +146,7 @@ if (lp && lp->data && lp->data == plugin) lp = s->cur_plugins->next; + /* if there is only one plugin append all items */ if ((lp) && (!lp->next)) { pp = lp->data; @@ -160,6 +161,8 @@ } } } + /* if there is input append all items that match or have + fuzzy_match set to -1 */ else if (input) { EINA_LIST_FOREACH(lp, l, pp) @@ -179,11 +182,11 @@ } } } + /* always append items of action or object selector */ else if ((!input) && ((p->selector == selectors[1]) || (p->selector == selectors[2]))) { - /* always append items of action or object selector */ EINA_LIST_FOREACH(lp, l, pp) { if (!pp->aggregate) continue; @@ -200,6 +203,7 @@ } } } + /* no input: append all items that are in history */ else { EINA_LIST_FOREACH(lp, l, pp) |