g_utf8_pointer_to_offset returns offsets in char units and not in byte units.

We're incorrectly cutting names in UTF-8 when replying email due to errors computing lengths

Fixes NB#142722

diff --git a/src/modest-text-utils.c b/src/modest-text-utils.c
index eca911c..cd209a8 100644 (file)
--- a/src/modest-text-utils.c
+++ b/src/modest-text-utils.c
@@ -2193,13 +2193,9 @@ quote_name_part (GString **str, gchar **cur, gchar **start)
                        *start = g_utf8_next_char (*cur);
                } else {
                        *str = g_string_append_c (*str, '"');
                        *start = g_utf8_next_char (*cur);
                } else {
                        *str = g_string_append_c (*str, '"');

-                       *str = g_string_append_len (*str, *start,
-                                                   (g_utf8_pointer_to_offset (*start, blank) -
-                                                    g_utf8_pointer_to_offset (*start, *start)));
+                       *str = g_string_append_len (*str, *start, (blank - *start));

                        *str = g_string_append_c (*str, '"');
                        *str = g_string_append_c (*str, '"');

-                       *str = g_string_append_len (*str, blank,
-                                                   (g_utf8_pointer_to_offset (*start, *cur) -
-                                                    g_utf8_pointer_to_offset (*start, blank)));
+                       *str = g_string_append_len (*str, blank, (*cur - blank));

                        *str = g_string_append (*str, ";");
                        *start = g_utf8_next_char (*cur);
                }
                        *str = g_string_append (*str, ";");
                        *start = g_utf8_next_char (*cur);
                }