forked from enlightenment/enlightenment
'everything'
fix aggregator, comments SVN revision: 48269
This commit is contained in:
parent
0ac03dd26b
commit
22cc327c76
|
@ -130,14 +130,14 @@ _fetch(Evry_Plugin *plugin, const char *input)
|
||||||
/* get current 'context' ... */
|
/* get current 'context' ... */
|
||||||
for (i = 1; i < 3; i++)
|
for (i = 1; i < 3; i++)
|
||||||
{
|
{
|
||||||
Evry_Item *item;
|
|
||||||
if (p->selector == selectors[i])
|
if (p->selector == selectors[i])
|
||||||
{
|
{
|
||||||
item = selectors[i-1]->state->cur_item;
|
it = selectors[i-1]->state->cur_item;
|
||||||
context = item->context;
|
if (it) context = it->context;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* skip aggregator */
|
||||||
if (eina_list_data_find_list(s->cur_plugins, plugin))
|
if (eina_list_data_find_list(s->cur_plugins, plugin))
|
||||||
lp = s->cur_plugins->next;
|
lp = s->cur_plugins->next;
|
||||||
else
|
else
|
||||||
|
@ -146,6 +146,7 @@ _fetch(Evry_Plugin *plugin, const char *input)
|
||||||
if (lp && lp->data && lp->data == plugin)
|
if (lp && lp->data && lp->data == plugin)
|
||||||
lp = s->cur_plugins->next;
|
lp = s->cur_plugins->next;
|
||||||
|
|
||||||
|
/* if there is only one plugin append all items */
|
||||||
if ((lp) && (!lp->next))
|
if ((lp) && (!lp->next))
|
||||||
{
|
{
|
||||||
pp = lp->data;
|
pp = lp->data;
|
||||||
|
@ -160,6 +161,8 @@ _fetch(Evry_Plugin *plugin, const char *input)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
/* if there is input append all items that match or have
|
||||||
|
fuzzy_match set to -1 */
|
||||||
else if (input)
|
else if (input)
|
||||||
{
|
{
|
||||||
EINA_LIST_FOREACH(lp, l, pp)
|
EINA_LIST_FOREACH(lp, l, pp)
|
||||||
|
@ -179,11 +182,11 @@ _fetch(Evry_Plugin *plugin, const char *input)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
/* always append items of action or object selector */
|
||||||
else if ((!input) &&
|
else if ((!input) &&
|
||||||
((p->selector == selectors[1]) ||
|
((p->selector == selectors[1]) ||
|
||||||
(p->selector == selectors[2])))
|
(p->selector == selectors[2])))
|
||||||
{
|
{
|
||||||
/* always append items of action or object selector */
|
|
||||||
EINA_LIST_FOREACH(lp, l, pp)
|
EINA_LIST_FOREACH(lp, l, pp)
|
||||||
{
|
{
|
||||||
if (!pp->aggregate) continue;
|
if (!pp->aggregate) continue;
|
||||||
|
@ -200,6 +203,7 @@ _fetch(Evry_Plugin *plugin, const char *input)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
/* no input: append all items that are in history */
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
EINA_LIST_FOREACH(lp, l, pp)
|
EINA_LIST_FOREACH(lp, l, pp)
|
||||||
|
|
Loading…
Reference in New Issue