[Xfce4-commits] <midori:master> Avoid string split in midori_location_action_popup_timeout_cb
Christian Dywan
noreply at xfce.org
Mon Feb 20 22:00:04 CET 2012
Updating branch refs/heads/master
to 79b29a9362fad97754471f8152aaf8ae1d1880ac (commit)
from f3a4bd4b6a8cf5d2559bd898f29e697cfc197349 (commit)
commit 79b29a9362fad97754471f8152aaf8ae1d1880ac
Author: Christian Dywan <christian at twotoasts.de>
Date: Mon Feb 20 21:58:03 2012 +0100
Avoid string split in midori_location_action_popup_timeout_cb
midori/midori-locationaction.c | 16 +++++-----------
1 files changed, 5 insertions(+), 11 deletions(-)
diff --git a/midori/midori-locationaction.c b/midori/midori-locationaction.c
index 93061b9..ea42789 100644
--- a/midori/midori-locationaction.c
+++ b/midori/midori-locationaction.c
@@ -418,20 +418,14 @@ midori_location_action_popup_timeout_cb (gpointer data)
return FALSE;
/* No completion when typing a search token */
- if (action->search_engines != NULL)
+ if (action->search_engines
+ && katze_array_find_token (action->search_engines, action->key))
{
- 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);
+ midori_location_action_popdown_completion (action);
+ return FALSE;
}
- /* Empaty string or starting with a space means: no completion */
+ /* Empty string or starting with a space means: no completion */
if (!(action->key && *action->key && *action->key != ' '))
{
midori_location_action_popdown_completion (action);
More information about the Xfce4-commits
mailing list