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

Normalize text when matching location completion

Browse source
This commit is contained in:
Christian Dywan 2009-12-26 22:57:18 +01:00
parent 0f988af446
commit bf11be2cfe
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
midori/midori-locationaction.c
View file

@ -665,7 +665,7 @@ midori_location_entry_render_text_cb (GtkCellLayout* layout,
g_object_unref (icon); g_object_unref (icon);
desc = desc_uri = desc_title = key = NULL; desc = desc_uri = desc_title = key = NULL;
key = g_ascii_strdown (gtk_entry_get_text (GTK_ENTRY (entry)), -1); key = g_utf8_strdown (gtk_entry_get_text (GTK_ENTRY (entry)), -1);
len = 0; len = 0;
if (G_LIKELY (uri)) if (G_LIKELY (uri))
@ -755,15 +755,21 @@ midori_location_entry_completion_match_cb (GtkEntryCompletion* completion,
match = FALSE; match = FALSE;
if (G_LIKELY (uri)) if (G_LIKELY (uri))
{ {
gchar* fkey = g_utf8_casefold (key, -1); gchar* nkey = g_utf8_normalize (key, -1, G_NORMALIZE_ALL);
gchar* furi = g_utf8_casefold (uri, -1); gchar* nuri = g_utf8_normalize (uri, -1, G_NORMALIZE_ALL);
gchar* fkey = g_utf8_casefold (nkey, -1);
gchar* furi = g_utf8_casefold (nuri, -1);
g_free (uri); g_free (uri);
g_free (nkey);
g_free (nuri);
match = strstr (furi, fkey) != NULL; match = strstr (furi, fkey) != NULL;
g_free (furi); g_free (furi);
if (!match && G_LIKELY (title)) if (!match && G_LIKELY (title))
{ {
gchar* ftitle = g_utf8_casefold (title, -1); gchar* ntitle = g_utf8_normalize (title, -1, G_NORMALIZE_ALL);
gchar* ftitle = g_utf8_casefold (ntitle, -1);
g_free (ntitle);
match = strstr (ftitle, fkey) != NULL; match = strstr (ftitle, fkey) != NULL;
g_free (ftitle); g_free (ftitle);
} }