fix bug. aggregator didnt fetch from first plugin

SVN revision: 48265
This commit is contained in:
Hannes Janetzek 2010-04-24 00:51:08 +00:00
parent 343601a12f
commit da0e1fb856
2 changed files with 8 additions and 12 deletions

View File

@ -1954,7 +1954,7 @@ _evry_matches_update(Evry_Selector *sel, int async)
EINA_LIST_FOREACH(s->plugins, l, p) EINA_LIST_FOREACH(s->plugins, l, p)
{ {
if ((!win->plugin_dedicated) && if (!(win->plugin_dedicated) &&
(p->config->trigger_only) && (p->config->trigger_only) &&
(p->config->trigger)) (p->config->trigger))
continue; continue;
@ -1967,12 +1967,9 @@ _evry_matches_update(Evry_Selector *sel, int async)
} }
else else
{ {
p->changed = EINA_TRUE;
if ((p->fetch(p, input)) || if ((p->fetch(p, input)) ||
(sel->states->next) || (sel->states->next) ||
(win->plugin_dedicated)) (win->plugin_dedicated))
{
s->cur_plugins = eina_list_append(s->cur_plugins, p); s->cur_plugins = eina_list_append(s->cur_plugins, p);
} }
} }
@ -1980,7 +1977,6 @@ _evry_matches_update(Evry_Selector *sel, int async)
if (sel->aggregator->fetch(sel->aggregator, input)) if (sel->aggregator->fetch(sel->aggregator, input))
_evry_plugin_list_insert(s, sel->aggregator); _evry_plugin_list_insert(s, sel->aggregator);
}
if (s->plugin_auto_selected || if (s->plugin_auto_selected ||
(s->plugin && (!eina_list_data_find(s->cur_plugins, s->plugin)))) (s->plugin && (!eina_list_data_find(s->cur_plugins, s->plugin))))

View File

@ -126,7 +126,7 @@ _fetch(Evry_Plugin *plugin, const char *input)
return 0; return 0;
/* first is aggregator itself */ /* first is aggregator itself */
lp = s->cur_plugins->next; lp = s->cur_plugins;
EVRY_PLUGIN_ITEMS_FREE(p); EVRY_PLUGIN_ITEMS_FREE(p);