From 72064de9fe064a7536b501fc470edf75fc393314 Mon Sep 17 00:00:00 2001
From: Xavier G <xavier.github@kindwolf.org>
Date: Fri, 13 May 2016 04:19:38 +0200
Subject: [PATCH] Simplify scrlen_str() using string_width().

---
 src/fe-text/gui-entry.c | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

diff --git a/src/fe-text/gui-entry.c b/src/fe-text/gui-entry.c
index beea2273..949a43d3 100644
--- a/src/fe-text/gui-entry.c
+++ b/src/fe-text/gui-entry.c
@@ -366,22 +366,8 @@ static int scrlen_str(const char *str)
 	char *stripped;
 	g_return_val_if_fail(str != NULL, 0);
 
-	str = stripped = strip_codes(str);
-	if (string_policy(str) == TREAT_STRING_AS_UTF8) {
-
-		while (*str != '\0') {
-			gunichar c;
-
-			c = g_utf8_get_char(str);
-			str = g_utf8_next_char(str);
-
-			len += unichar_isprint(c) ? mk_wcwidth(c) : 1;
-		}
-
-	} else {
-		len = strlen(str);
-	}
-
+	stripped = strip_codes(str);
+	len = string_width(stripped, -1);
 	g_free(stripped);
 	return len;
 }