From 58b16dcae8553268638f5b2a1e1ad6b2f7f7984c Mon Sep 17 00:00:00 2001
From: Perry Werneck <perry.werneck@gmail.com>
Date: Fri, 11 Jan 2019 13:11:27 -0200
Subject: [PATCH] Updating application to reflect API updates.

---
 gitsync.sh                     | 2 ++
 modules/lib3270                | 2 +-
 modules/libv3270               | 2 +-
 src/plugins/dbus3270/gobject.c | 6 +++---
 src/pw3270/actions.c           | 3 +--
 src/pw3270/uiparser/button.c   | 1 -
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/gitsync.sh b/gitsync.sh
index c69ba2e..d295ec0 100755
--- a/gitsync.sh
+++ b/gitsync.sh
@@ -19,6 +19,8 @@
 
 # git fetch lib3270
 
+git push
+
 git fetch origin
 git checkout master
 git merge origin/master
diff --git a/modules/lib3270 b/modules/lib3270
index 65911c5..5167705 160000
--- a/modules/lib3270
+++ b/modules/lib3270
@@ -1 +1 @@
-Subproject commit 65911c554ce0232cabef832ac46c3ff654aee24f
+Subproject commit 5167705057b94751624fae6b76db137b86811c4b
diff --git a/modules/libv3270 b/modules/libv3270
index 0f265d2..76e1e3f 160000
--- a/modules/libv3270
+++ b/modules/libv3270
@@ -1 +1 @@
-Subproject commit 0f265d2041316c5db146a717a21ed21620c44c26
+Subproject commit 76e1e3fdf87ace980c4f21222a872f9407639f55
diff --git a/src/plugins/dbus3270/gobject.c b/src/plugins/dbus3270/gobject.c
index 51feab8..35a5155 100644
--- a/src/plugins/dbus3270/gobject.c
+++ b/src/plugins/dbus3270/gobject.c
@@ -96,8 +96,8 @@ void pw3270_dbus_connect(PW3270Dbus *object, const gchar *uri, DBusGMethodInvoca
 
 	if(uri && *uri)
 	{
-		const char * host = lib3270_set_url(hSession,uri);
-		g_message("Connecting to \"%s\" by remote request",host);
+		lib3270_set_url(hSession,uri);
+		g_message("Connecting to \"%s\" by remote request",lib3270_get_url(hSession));
 	}
 	else
 	{
@@ -113,7 +113,7 @@ void pw3270_dbus_set_ur_l(PW3270Dbus *object, const gchar *uri, DBusGMethodInvoc
 
 	g_message("Changing host to \"%s\" by remote request",uri);
 
-	dbus_g_method_return(context,lib3270_set_url(pw3270_dbus_get_session_handle(PW3270_DBUS(object)),uri) == NULL);
+	dbus_g_method_return(context,lib3270_set_url(pw3270_dbus_get_session_handle(PW3270_DBUS(object)),uri) != 0);
 }
 
 void pw3270_dbus_get_ur_l(PW3270Dbus *object, DBusGMethodInvocation *context)
diff --git a/src/pw3270/actions.c b/src/pw3270/actions.c
index 8687e72..e8f3900 100644
--- a/src/pw3270/actions.c
+++ b/src/pw3270/actions.c
@@ -40,7 +40,7 @@
  #include <lib3270/actions.h>
  #include <lib3270/selection.h>
  #include <lib3270/trace.h>
- #include <lib3270/macros.h>
+// #include <lib3270/macros.h>
  #include <lib3270/log.h>
  #include <stdlib.h>
 
@@ -915,7 +915,6 @@ GtkAction * ui_get_action(GtkWidget *widget, const gchar *name, GHashTable *hash
 
 static void action_text_script(GtkAction *action, GtkWidget *widget)
 {
-	v3270_run_script(widget,g_object_get_data(G_OBJECT(action),"script_text"));
 }
 
 void ui_connect_text_script(GtkWidget *widget, GtkAction *action, const gchar *script_text, GError **error)
diff --git a/src/pw3270/uiparser/button.c b/src/pw3270/uiparser/button.c
index ae9a0e4..57fa936 100644
--- a/src/pw3270/uiparser/button.c
+++ b/src/pw3270/uiparser/button.c
@@ -72,7 +72,6 @@
 
  static void button_script(GtkButton *button, GtkWidget *widget)
  {
-	v3270_run_script(widget,g_object_get_data(G_OBJECT(button),"script_text"));
  }
 
  void keypad_button_start(GMarkupParseContext *context, const gchar **names,const gchar **values, GError **error, struct keypad *keypad)
--
libgit2 0.21.2