From 9937abe3fc6f094da5d0b2fca03327ab40ba9b6f Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 27 Oct 2011 19:26:45 +0200 Subject: [PATCH] No completion when typing token or leading space --- midori/midori-locationaction.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/midori/midori-locationaction.c b/midori/midori-locationaction.c index 0fc0374a..5d9b6ee8 100644 --- a/midori/midori-locationaction.c +++ b/midori/midori-locationaction.c @@ -356,7 +356,22 @@ midori_location_action_popup_timeout_cb (gpointer data) if (!action->entry || !gtk_widget_has_focus (action->entry) || !action->history) 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); return FALSE; -- 2.39.5