From 77271f33d29ee79255167275add471ec7fc96d23 Mon Sep 17 00:00:00 2001
From: Denis Kenzior <denkenz@gmail.com>
Date: Fri, 21 Dec 2018 15:09:56 -0600
Subject: [PATCH] drivers: switch g_convert usage to ell

---
 drivers/atmodem/phonebook.c | 29 +++++++++++++----------------
 1 file changed, 13 insertions(+), 16 deletions(-)

diff --git a/drivers/atmodem/phonebook.c b/drivers/atmodem/phonebook.c
index 57b23b02..ccce6a4d 100644
--- a/drivers/atmodem/phonebook.c
+++ b/drivers/atmodem/phonebook.c
@@ -29,6 +29,7 @@
 #include <errno.h>
 
 #include <glib.h>
+#include <ell/ell.h>
 
 #include <ofono/log.h>
 #include <ofono/modem.h>
@@ -86,16 +87,12 @@ static gboolean parse_text(GAtResultIter *iter, char **str, int encoding)
 		if (g_at_result_iter_next_hexstring(iter, &hex, &len) == FALSE)
 			return FALSE;
 
-		utf8 = g_convert((const gchar*) hex, len,
-					"UTF-8//TRANSLIT", "UCS-2BE",
-					NULL, NULL, NULL);
+		utf8 = l_utf8_from_ucs2be(hex, len);
+		if (!utf8)
+			return FALSE;
 
-		if (utf8) {
-			*str = utf8;
-			return TRUE;
-		}
-
-		return FALSE;
+		*str = utf8;
+		return TRUE;
 	}
 
 	/*
@@ -103,7 +100,7 @@ static gboolean parse_text(GAtResultIter *iter, char **str, int encoding)
 	 * characters, same as in UTF8
 	 */
 	if (g_at_result_iter_next_string(iter, &string)) {
-		*str = g_strdup(string);
+		*str = l_strdup(string);
 		return TRUE;
 	}
 
@@ -187,12 +184,12 @@ static void at_cpbr_notify(GAtResult *result, gpointer user_data)
 			adtype, secondtext, email,
 			sip_uri, tel_uri);
 
-		g_free(text);
-		g_free(group);
-		g_free(secondtext);
-		g_free(email);
-		g_free(sip_uri);
-		g_free(tel_uri);
+		l_free(text);
+		l_free(group);
+		l_free(secondtext);
+		l_free(email);
+		l_free(sip_uri);
+		l_free(tel_uri);
 	}
 }