From 6eb626b11033bf81dffa4b25ebfeae5a09e2579d Mon Sep 17 00:00:00 2001
From: Perry Werneck <perry.werneck@gmail.com>
Date: Wed, 16 Jan 2019 15:49:56 -0200
Subject: [PATCH] Updating main application.

---
 modules/lib3270                |  2 +-
 modules/libv3270               |  2 +-
 src/plugins/dbus3270/gobject.c |  2 +-
 src/pw3270/actions.c           |  4 ++--
 src/pw3270/globals.h           |  2 +-
 src/pw3270/hostdialog.c        |  2 +-
 src/pw3270/window.c            | 12 ++++++------
 7 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/modules/lib3270 b/modules/lib3270
index b8383bb..cfeeddb 160000
--- a/modules/lib3270
+++ b/modules/lib3270
@@ -1 +1 @@
-Subproject commit b8383bb61d0ad5e2ad93b56826a614ea9156396e
+Subproject commit cfeeddbfed2988408dc9af7996080425475cf550
diff --git a/modules/libv3270 b/modules/libv3270
index cc57b4f..6a30818 160000
--- a/modules/libv3270
+++ b/modules/libv3270
@@ -1 +1 @@
-Subproject commit cc57b4fbfd1a8c841689f563ed9f78903659eda4
+Subproject commit 6a308188fb74a6b619d488275fe824d2df9214c5
diff --git a/src/plugins/dbus3270/gobject.c b/src/plugins/dbus3270/gobject.c
index 35a5155..f659aa3 100644
--- a/src/plugins/dbus3270/gobject.c
+++ b/src/plugins/dbus3270/gobject.c
@@ -104,7 +104,7 @@ void pw3270_dbus_connect(PW3270Dbus *object, const gchar *uri, DBusGMethodInvoca
 		g_message("%s","Connecting by remote request");
 	}
 
-	dbus_g_method_return(context,lib3270_connect(hSession,0));
+	dbus_g_method_return(context,lib3270_reconnect(hSession,0));
 }
 
 void pw3270_dbus_set_ur_l(PW3270Dbus *object, const gchar *uri, DBusGMethodInvocation *context)
diff --git a/src/pw3270/actions.c b/src/pw3270/actions.c
index e8f3900..3126308 100644
--- a/src/pw3270/actions.c
+++ b/src/pw3270/actions.c
@@ -83,7 +83,7 @@ static void connect_action(GtkAction *action, GtkWidget *widget)
 		v3270_set_url(widget,host);
 
 	if(systype)
-		v3270_set_host_type(widget,systype);
+		v3270_set_host_type_by_name(widget,systype);
 
 	if(colortype)
 		v3270_set_session_color_type(widget,atoi(colortype));
@@ -91,7 +91,7 @@ static void connect_action(GtkAction *action, GtkWidget *widget)
 	host = v3270_get_hostname(widget);
 	if(host && *host)
 	{
-		v3270_connect(widget);
+		v3270_reconnect(widget);
 		return;
 	}
 
diff --git a/src/pw3270/globals.h b/src/pw3270/globals.h
index 999f069..b1b2132 100644
--- a/src/pw3270/globals.h
+++ b/src/pw3270/globals.h
@@ -62,7 +62,7 @@
  G_GNUC_INTERNAL void			  setup_font_list(GtkWidget *widget, GtkWidget *obj);
  G_GNUC_INTERNAL void			  load_color_schemes(GtkWidget *widget, gchar *active);
  G_GNUC_INTERNAL GtkWidget		* color_scheme_new(const GdkRGBA *current);
- G_GNUC_INTERNAL LIB3270_OPTION	  pw3270_options_by_hosttype(const gchar *systype);
+// G_GNUC_INTERNAL LIB3270_OPTION	  pw3270_options_by_hosttype(const gchar *systype);
  G_GNUC_INTERNAL void			  run_security_dialog(GtkWidget *widget);
 
  // actions
diff --git a/src/pw3270/hostdialog.c b/src/pw3270/hostdialog.c
index c8310b5..63b02d5 100644
--- a/src/pw3270/hostdialog.c
+++ b/src/pw3270/hostdialog.c
@@ -41,7 +41,7 @@
 
 	ptr = get_string_from_config("host","systype","s390");
 	if(*ptr)
-		lib3270_set_host_type(hSession,ptr);
+		lib3270_set_host_type_by_name(hSession,ptr);
 	g_free(ptr);
 
 	v3270_select_host(widget);
diff --git a/src/pw3270/window.c b/src/pw3270/window.c
index 6c40ae4..4651f12 100644
--- a/src/pw3270/window.c
+++ b/src/pw3270/window.c
@@ -327,7 +327,7 @@
  void pw3270_connect(GtkWidget *widget)
  {
  	g_return_if_fail(GTK_IS_PW3270(widget));
- 	v3270_connect(GTK_PW3270(widget)->terminal);
+ 	v3270_reconnect(GTK_PW3270(widget)->terminal);
  }
 
  void pw3270_set_url(GtkWidget *widget, const gchar *uri)
@@ -398,7 +398,7 @@
 
  	g_return_if_fail(GTK_IS_PW3270(widget));
 
-	int rc = v3270_set_host_type(GTK_PW3270(widget)->terminal,name);
+	int rc = v3270_set_host_type_by_name(GTK_PW3270(widget)->terminal,name);
 
 	if(!rc) {
 		return;
@@ -414,18 +414,18 @@
 
 	// Obtenho as opções válidas.
 	char text[4096];
-	const LIB3270_OPTION_ENTRY *host_type = lib3270_get_option_list();
+	const LIB3270_HOST_TYPE_ENTRY * host_types = lib3270_get_option_list();
 
 	*text = 0;
-	for(f=1;host_type[f].name;f++)
+	for(f=1;host_types[f].name;f++)
 	{
 		sz = strlen(text);
-		snprintf(text+sz,4095-sz,_( "%s<b>%s</b> for %s"), *text ? ", " : "",host_type[f].name,gettext(host_type[f].description));
+		snprintf(text+sz,4095-sz,_( "%s<b>%s</b> for %s"), *text ? ", " : "",host_types[f].name,gettext(host_types[f].description));
 
 	}
 
 	sz = strlen(text);
-	snprintf(text+sz,4095-sz,_( " and <b>%s</b> for %s."),host_type[0].name,gettext(host_type[0].description));
+	snprintf(text+sz,4095-sz,_( " and <b>%s</b> for %s."),host_types[0].name,gettext(host_types[0].description));
 
 	gtk_message_dialog_format_secondary_markup(GTK_MESSAGE_DIALOG(popup),_( "The known types are %s" ),text);
 
--
libgit2 0.21.2