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

Back to case folding and handling completion actions properly

Browse source
This commit is contained in:
Christian Dywan 2009-11-23 20:41:10 +01:00
parent e5cb4bb383
commit c26d1775e9
1 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
midori/midori-locationaction.c
View file

@ -742,11 +742,20 @@ midori_location_entry_completion_match_cb (GtkEntryCompletion* completion,
match = FALSE; match = FALSE;
if (G_LIKELY (uri)) if (G_LIKELY (uri))
{ {
match = strstr (uri, key) != NULL; gchar* fkey = g_utf8_casefold (key, -1);
gchar* furi = g_utf8_casefold (uri, -1);
g_free (uri); g_free (uri);
match = strstr (furi, fkey) != NULL;
g_free (furi);
if (!match && G_LIKELY (title)) if (!match && G_LIKELY (title))
match = strstr (title, key) != NULL; {
gchar* ftitle = g_utf8_casefold (title, -1);
match = strstr (ftitle, fkey) != NULL;
g_free (ftitle);
}
g_free (fkey);
} }
g_free (title); g_free (title);
@ -1414,11 +1423,10 @@ 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);