From: Sergio Villar Senin <svillar@igalia.com>
Date: Mon, 9 Nov 2009 16:27:54 +0000 (+0100)
Subject: g_utf8_pointer_to_offset returns offsets in char units and not in byte units.
X-Git-Tag: 3.2.2~2
X-Git-Url: http://git.maemo.org/git/?p=modest;a=commitdiff_plain;h=8ced6118ac86c3307ca676a5a705d6144e3349b7

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
--- 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, '"');
-			*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_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);
 		}