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

Using non-utf8 strlen for titles in completion should suffice

Browse source
This commit is contained in:
Christian Dywan 2009-04-13 22:43:07 +02:00
parent c27642e912
commit a324cad92a
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
midori/midori-locationaction.c
View file

@ -541,11 +541,10 @@ midori_location_entry_render_text_cb (GtkCellLayout* layout,
temp = g_utf8_strdown (title, -1); temp = g_utf8_strdown (title, -1);
if ((start = strstr (temp, key))) if ((start = strstr (temp, key)))
{ {
size_t utf8_len = g_utf8_strlen (key, -1);
if (!len) if (!len)
len = strlen (key); len = strlen (key);
skey = g_malloc0 (len + 1); skey = g_malloc0 (len + 1);
g_utf8_strncpy (skey, title + (start - temp), utf8_len); strncpy (skey, title + (start - temp), len);
parts = g_strsplit (title, skey, 2); parts = g_strsplit (title, skey, 2);
if (parts && parts[0] && parts[1]) if (parts && parts[0] && parts[1])
desc_title = g_markup_printf_escaped ("%s<b>%s</b>%s", desc_title = g_markup_printf_escaped ("%s<b>%s</b>%s",

2
tests/completion.c
View file

@ -31,7 +31,7 @@ static const CompletionItem items[] = {
{ "http://one.com/one/", "One off" }, { "http://one.com/one/", "One off" },
{ "http://four.org", "One" }, { "http://four.org", "One" },
{ "https://four.org", "Four" }, { "https://four.org", "Four" },
{ "ftp://four.org/", "Five" }, { "ftp://four.org/", "ごオルゴ" },
{ "http://muenchen.de/weißwürste/", "Münchner Weißwürste" }, /* Umlauts */ { "http://muenchen.de/weißwürste/", "Münchner Weißwürste" }, /* Umlauts */
}; };
static const guint items_n = 9; static const guint items_n = 9;