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

Fold strings before matching to improve the comparabillity

Browse source
This commit is contained in:
Christian Dywan 2009-11-21 07:17:45 +01:00
parent 6ed99001fc
commit 94ee507492
1 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
midori/midori-locationaction.c
View file

@ -736,6 +736,7 @@ midori_location_entry_completion_match_cb (GtkEntryCompletion* completion,
gchar* title; gchar* title;
gboolean match; gboolean match;
gchar* temp; gchar* temp;
gchar* ftemp;
model = gtk_entry_completion_get_model (completion); model = gtk_entry_completion_get_model (completion);
gtk_tree_model_get (model, iter, URI_COL, &uri, TITLE_COL, &title, -1); gtk_tree_model_get (model, iter, URI_COL, &uri, TITLE_COL, &title, -1);
@ -744,18 +745,24 @@ midori_location_entry_completion_match_cb (GtkEntryCompletion* completion,
if (G_LIKELY (uri)) if (G_LIKELY (uri))
{ {
gchar* ckey = g_utf8_collate_key (key, -1); gchar* ckey = g_utf8_collate_key (key, -1);
gchar* fkey = g_utf8_casefold (ckey, -1);
g_free (ckey);
temp = g_utf8_collate_key (uri, -1); temp = g_utf8_collate_key (uri, -1);
match = (strstr (temp, ckey) != NULL); ftemp = g_utf8_casefold (temp, -1);
g_free (temp); g_free (temp);
match = (strstr (ftemp, fkey) != NULL);
g_free (ftemp);
g_free (uri); g_free (uri);
if (!match && G_LIKELY (title)) if (!match && G_LIKELY (title))
{ {
temp = g_utf8_collate_key (title, -1); temp = g_utf8_collate_key (title, -1);
match = (strstr (temp, ckey) != NULL); ftemp = g_utf8_casefold (temp, -1);
g_free (temp); g_free (temp);
match = (strstr (ftemp, fkey) != NULL);
g_free (ftemp);
} }
g_free (ckey); g_free (fkey);
} }
g_free (title); g_free (title);
@ -1423,10 +1430,12 @@ midori_location_action_set_search_engines (MidoriLocationAction* location_action
completion = gtk_entry_get_completion (GTK_ENTRY (child)); completion = gtk_entry_get_completion (GTK_ENTRY (child));
i = 0; i = 0;
if (location_action->search_engines) if (location_action->search_engines)
{
while ((item = katze_array_get_nth_item (location_action->search_engines, i++))) while ((item = katze_array_get_nth_item (location_action->search_engines, i++)))
gtk_entry_completion_delete_action (completion, 0); gtk_entry_completion_delete_action (completion, 0);
midori_location_action_add_actions (completion, search_engines); midori_location_action_add_actions (completion, search_engines);
} }
}
katze_object_assign (location_action->search_engines, search_engines); katze_object_assign (location_action->search_engines, search_engines);
/* FIXME: Take care of adding and removing search engines as needed */ /* FIXME: Take care of adding and removing search engines as needed */