forked from enlightenment/enlightenment
fix bug. aggregator didnt fetch from first plugin
SVN revision: 48265
This commit is contained in:
parent
343601a12f
commit
da0e1fb856
|
@ -1060,7 +1060,7 @@ _evry_selector_actions_get(Evry_Item *it)
|
|||
|
||||
EINA_LIST_FOREACH(sel->plugins, l, plugin)
|
||||
{
|
||||
if ((plugin == sel->actions) ||
|
||||
if ((plugin == sel->actions) ||
|
||||
(plugin->type_in && type_out && plugin->type_in == type_out))
|
||||
{
|
||||
if (plugin->begin)
|
||||
|
@ -1954,7 +1954,7 @@ _evry_matches_update(Evry_Selector *sel, int async)
|
|||
|
||||
EINA_LIST_FOREACH(s->plugins, l, p)
|
||||
{
|
||||
if ((!win->plugin_dedicated) &&
|
||||
if (!(win->plugin_dedicated) &&
|
||||
(p->config->trigger_only) &&
|
||||
(p->config->trigger))
|
||||
continue;
|
||||
|
@ -1967,21 +1967,17 @@ _evry_matches_update(Evry_Selector *sel, int async)
|
|||
}
|
||||
else
|
||||
{
|
||||
p->changed = EINA_TRUE;
|
||||
|
||||
if ((p->fetch(p, input)) ||
|
||||
(sel->states->next) ||
|
||||
(win->plugin_dedicated))
|
||||
{
|
||||
s->cur_plugins = eina_list_append(s->cur_plugins, p);
|
||||
}
|
||||
s->cur_plugins = eina_list_append(s->cur_plugins, p);
|
||||
}
|
||||
}
|
||||
|
||||
if (sel->aggregator->fetch(sel->aggregator, input))
|
||||
_evry_plugin_list_insert(s, sel->aggregator);
|
||||
}
|
||||
|
||||
if (sel->aggregator->fetch(sel->aggregator, input))
|
||||
_evry_plugin_list_insert(s, sel->aggregator);
|
||||
|
||||
if (s->plugin_auto_selected ||
|
||||
(s->plugin && (!eina_list_data_find(s->cur_plugins, s->plugin))))
|
||||
_evry_plugin_select(s, NULL);
|
||||
|
|
|
@ -126,7 +126,7 @@ _fetch(Evry_Plugin *plugin, const char *input)
|
|||
return 0;
|
||||
|
||||
/* first is aggregator itself */
|
||||
lp = s->cur_plugins->next;
|
||||
lp = s->cur_plugins;
|
||||
|
||||
EVRY_PLUGIN_ITEMS_FREE(p);
|
||||
|
||||
|
@ -163,7 +163,7 @@ _fetch(Evry_Plugin *plugin, const char *input)
|
|||
((p->selector == selectors[1]) ||
|
||||
(p->selector == selectors[2])))
|
||||
{
|
||||
EINA_LIST_FOREACH(lp, l, pp)
|
||||
EINA_LIST_FOREACH(lp, l, pp)
|
||||
{
|
||||
if (!pp->aggregate) continue;
|
||||
cnt = 0;
|
||||
|
|
Loading…
Reference in New Issue