debian/midori
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

No completion when typing token or leading space

Browse source
This commit is contained in:
Christian Dywan 2011-10-27 19:26:45 +02:00
parent 2a03ba5b5b
commit 9937abe3fc
1 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
midori/midori-locationaction.c
View file

@ -356,7 +356,22 @@ midori_location_action_popup_timeout_cb (gpointer data)
if (!action->entry || !gtk_widget_has_focus (action->entry) || !action->history) if (!action->entry || !gtk_widget_has_focus (action->entry) || !action->history)
return FALSE; return FALSE;
if (!(action->key && *action->key)) /* No completion when typing a search token */
if (action->search_engines != NULL)
{
gchar** parts = g_strsplit (action->key, " ", 2);
if (parts && *parts && parts[1]
&& katze_array_find_token (action->search_engines, *parts))
{
g_strfreev (parts);
midori_location_action_popdown_completion (action);
return FALSE;
}
g_strfreev (parts);
}
/* Empaty string or starting with a space means: no completion */
if (!(action->key && *action->key && *action->key != ' '))
{ {
midori_location_action_popdown_completion (action); midori_location_action_popdown_completion (action);
return FALSE; return FALSE;