From fa60b75334999bedb28dfacdbb5a73f1cc62193a Mon Sep 17 00:00:00 2001 From: Xavier Claessens Date: Thu, 22 Jul 2010 15:02:06 +0200 Subject: Make livesearch work if accentued letters are pre-decomposed --- libempathy-gtk/empathy-live-search.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'libempathy-gtk') diff --git a/libempathy-gtk/empathy-live-search.c b/libempathy-gtk/empathy-live-search.c index e0f5e193f..8a627ead1 100644 --- a/libempathy-gtk/empathy-live-search.c +++ b/libempathy-gtk/empathy-live-search.c @@ -84,7 +84,9 @@ stripped_char (gunichar ch) case G_UNICODE_CONTROL: case G_UNICODE_FORMAT: case G_UNICODE_UNASSIGNED: + case G_UNICODE_NON_SPACING_MARK: case G_UNICODE_COMBINING_MARK: + case G_UNICODE_ENCLOSING_MARK: /* Ignore those */ break; default: @@ -120,16 +122,14 @@ strip_utf8_string (const gchar *string) /* Strip this word */ while (*p != '\0') { - gunichar c; gunichar sc; - c = g_utf8_get_char (p); - if (!g_unichar_isalnum (c)) - break; - - sc = stripped_char (c); + sc = stripped_char (g_utf8_get_char (p)); if (sc != 0) { + if (!g_unichar_isalnum (sc)) + break; + if (str == NULL) str = g_string_new (NULL); g_string_append_unichar (str, sc); -- cgit v1.2.3