diff --git a/accessible.c b/accessible.c
index 2a749ec..d8ae7b8 100644
--- a/accessible.c
+++ b/accessible.c
@@ -195,7 +195,7 @@ static gunichar v3270_accessible_get_character_at_offset(AtkText *atk_text, gint
 			gchar		* utfstring	= g_convert_with_fallback(	text,
 																-1,
 																"UTF-8",
-																lib3270_get_charset(host),
+																lib3270_get_display_charset(host),
 																" ",
 																NULL,
 																&bytes_written,
@@ -390,7 +390,7 @@ static gchar * v3270_accessible_get_text_at_offset(AtkText *atk_text, gint offse
 		gchar	* utfchar	= g_convert_with_fallback(	text,
 															-1,
 															"UTF-8",
-															lib3270_get_charset(host),
+															lib3270_get_display_charset(host),
 															" ",
 															NULL,
 															&bytes_written,
@@ -433,7 +433,7 @@ static gchar * v3270_accessible_get_text(AtkText *atk_text, gint start_pos, gint
 		gsize	  bytes_written;
 		GError	* error		= NULL;
 
-		utftext =  g_convert_with_fallback(text,-1,"UTF-8",lib3270_get_charset(host)," ",NULL,&bytes_written, &error);
+		utftext =  g_convert_with_fallback(text,-1,"UTF-8",lib3270_get_display_charset(host)," ",NULL,&bytes_written, &error);
 
 		if(error)
 		{
diff --git a/draw.c b/draw.c
index 406b9b7..488aad7 100644
--- a/draw.c
+++ b/draw.c
@@ -275,7 +275,7 @@ void v3270_draw_char(cairo_t *cr, unsigned char chr, unsigned short attr, H3270 
 	}
 	else if(chr)
 	{
-		gchar *utf = g_convert((char *) &chr, 1, "UTF-8", lib3270_get_charset(session), NULL, NULL, NULL);
+		gchar *utf = g_convert((char *) &chr, 1, "UTF-8", lib3270_get_display_charset(session), NULL, NULL, NULL);
 
 		if(utf)
 		{
diff --git a/keyboard.c b/keyboard.c
index 471d18f..61a6f99 100644
--- a/keyboard.c
+++ b/keyboard.c
@@ -247,7 +247,7 @@
 
 	host = GTK_V3270(widget)->host;
 
-	utf = g_convert((char *) str, -1, lib3270_get_charset(host), "UTF-8", NULL, NULL, NULL);
+	utf = g_convert((char *) str, -1, lib3270_get_display_charset(host), "UTF-8", NULL, NULL, NULL);
 
 	if(utf)
 	{
@@ -259,7 +259,7 @@
 
  void v3270_key_commit(GtkIMContext *imcontext, gchar *str, v3270 *widget)
  {
-	gchar *utf = g_convert((char *) str, -1, lib3270_get_charset(widget->host), "UTF-8", NULL, NULL, NULL);
+	gchar *utf = g_convert((char *) str, -1, lib3270_get_display_charset(widget->host), "UTF-8", NULL, NULL, NULL);
 
 	if(utf)
 	{
diff --git a/selection.c b/selection.c
index cfaf05e..c0ea9a7 100644
--- a/selection.c
+++ b/selection.c
@@ -70,7 +70,7 @@ static void clipboard_get(GtkClipboard *clipboard, GtkSelectionData *selection, 
         }
 		else
         {
-            gchar * text = g_convert(widget->selection.text, -1, "UTF-8", lib3270_get_charset(widget->host), NULL, NULL, NULL);
+            gchar * text = g_convert(widget->selection.text, -1, "UTF-8", lib3270_get_display_charset(widget->host), NULL, NULL, NULL);
 			gtk_selection_data_set_text(selection,text,-1);
 			g_free(text);
         }
@@ -104,7 +104,7 @@ gchar * v3270_get_text(GtkWidget *widget, int offset, int len)
 	if(!str)
 		return NULL;
 
-	text = g_convert(str, -1, "UTF-8", lib3270_get_charset(terminal->host), NULL, NULL, NULL);
+	text = g_convert(str, -1, "UTF-8", lib3270_get_display_charset(terminal->host), NULL, NULL, NULL);
 
 	lib3270_free(str);
 	return text;
@@ -226,7 +226,7 @@ gchar * v3270_get_selected(GtkWidget *widget, gboolean cut)
     text = update_selected_text(widget,cut);
 
     if(text)
-        return g_convert(text, -1, "UTF-8", lib3270_get_charset(GTK_V3270(widget)->host), NULL, NULL, NULL);
+        return g_convert(text, -1, "UTF-8", lib3270_get_display_charset(GTK_V3270(widget)->host), NULL, NULL, NULL);
 
     return NULL;
 }
@@ -242,7 +242,7 @@ gchar * v3270_get_copy(GtkWidget *widget)
         text = update_selected_text(widget,FALSE);
 
     if(text)
-        return g_convert(text, -1, "UTF-8", lib3270_get_charset(GTK_V3270(widget)->host), NULL, NULL, NULL);
+        return g_convert(text, -1, "UTF-8", lib3270_get_display_charset(GTK_V3270(widget)->host), NULL, NULL, NULL);
 
     return NULL;
 }
@@ -266,7 +266,7 @@ void v3270_set_copy(GtkWidget *widget, const gchar *text)
 
     /* Received text, replace the selection buffer */
     terminal->table = 0;
-    isotext = g_convert(text, -1, lib3270_get_charset(terminal->host), "UTF-8", NULL, NULL, NULL);
+    isotext = g_convert(text, -1, lib3270_get_display_charset(terminal->host), "UTF-8", NULL, NULL, NULL);
 
     if(!isotext)
     {
@@ -350,7 +350,7 @@ void v3270_paste_string(GtkWidget *widget, const gchar *text, const gchar *encod
 {
  	gchar 		* buffer 	= NULL;
  	H3270		* session 	= v3270_get_session(widget);
-	const gchar * charset 	= lib3270_get_charset(session);
+	const gchar * charset 	= lib3270_get_display_charset(session);
  	gboolean	  next;
 
  	if(!text)
@@ -504,7 +504,7 @@ gchar * v3270_get_region(GtkWidget *widget, gint start_pos, gint end_pos, gboole
 	if(!str)
 		return NULL;
 
-	utftext = g_convert(str, -1, "UTF-8", lib3270_get_charset(GTK_V3270(widget)->host), NULL, NULL, NULL);
+	utftext = g_convert(str, -1, "UTF-8", lib3270_get_display_charset(GTK_V3270(widget)->host), NULL, NULL, NULL);
 
 	lib3270_free(str);
 
diff --git a/widget.c b/widget.c
index b234a9d..a87ec64 100644
--- a/widget.c
+++ b/widget.c
@@ -765,7 +765,7 @@ static void changed(H3270 *session, int offset, int len)
 			gchar	* utfchar	= g_convert_with_fallback(	text,
 																-1,
 																"UTF-8",
-																lib3270_get_charset(session),
+																lib3270_get_display_charset(session),
 																" ",
 																NULL,
 																&bytes_written,
--
libgit2 0.21.2