Download as
Browse Code »

Commit 58b16dcae8553268638f5b2a1e1ad6b2f7f7984c

Authored by Perry Werneck
1 parent cd54038e
Exists in master and in 5 other branches develop, edit-header-bar, keypads, script-support, v5.2

Updating application to reflect API updates.

Showing 6 changed files with 8 additions and 8 deletions   Show diff stats
gitsync.sh
  Diff comments   View file @58b16dc
... ... @@ -19,6 +19,8 @@
19 19  
20 20 # git fetch lib3270
21 21  
  22 +git push
  23 +
22 24 git fetch origin
23 25 git checkout master
24 26 git merge origin/master
... ...
modules/lib3270
  Diff comments   View file @58b16dc
1   -Subproject commit 65911c554ce0232cabef832ac46c3ff654aee24f
  1 +Subproject commit 5167705057b94751624fae6b76db137b86811c4b
... ...
modules/libv3270
  Diff comments   View file @58b16dc
1   -Subproject commit 0f265d2041316c5db146a717a21ed21620c44c26
  1 +Subproject commit 76e1e3fdf87ace980c4f21222a872f9407639f55
... ...
src/plugins/dbus3270/gobject.c
  Diff comments   View file @58b16dc
... ... @@ -96,8 +96,8 @@ void pw3270_dbus_connect(PW3270Dbus *object, const gchar *uri, DBusGMethodInvoca
96 96  
97 97 if(uri && *uri)
98 98 {
99   - const char * host = lib3270_set_url(hSession,uri);
100   - g_message("Connecting to \"%s\" by remote request",host);
  99 + lib3270_set_url(hSession,uri);
  100 + g_message("Connecting to \"%s\" by remote request",lib3270_get_url(hSession));
101 101 }
102 102 else
103 103 {
... ... @@ -113,7 +113,7 @@ void pw3270_dbus_set_ur_l(PW3270Dbus *object, const gchar *uri, DBusGMethodInvoc
113 113  
114 114 g_message("Changing host to \"%s\" by remote request",uri);
115 115  
116   - dbus_g_method_return(context,lib3270_set_url(pw3270_dbus_get_session_handle(PW3270_DBUS(object)),uri) == NULL);
  116 + dbus_g_method_return(context,lib3270_set_url(pw3270_dbus_get_session_handle(PW3270_DBUS(object)),uri) != 0);
117 117 }
118 118  
119 119 void pw3270_dbus_get_ur_l(PW3270Dbus *object, DBusGMethodInvocation *context)
... ...
src/pw3270/actions.c
  Diff comments   View file @58b16dc
... ... @@ -40,7 +40,7 @@
40 40 #include <lib3270/actions.h>
41 41 #include <lib3270/selection.h>
42 42 #include <lib3270/trace.h>
43   - #include <lib3270/macros.h>
  43 +// #include <lib3270/macros.h>
44 44 #include <lib3270/log.h>
45 45 #include <stdlib.h>
46 46  
... ... @@ -915,7 +915,6 @@ GtkAction * ui_get_action(GtkWidget *widget, const gchar *name, GHashTable *hash
915 915  
916 916 static void action_text_script(GtkAction *action, GtkWidget *widget)
917 917 {
918   - v3270_run_script(widget,g_object_get_data(G_OBJECT(action),"script_text"));
919 918 }
920 919  
921 920 void ui_connect_text_script(GtkWidget *widget, GtkAction *action, const gchar *script_text, GError **error)
... ...
src/pw3270/uiparser/button.c
  Diff comments   View file @58b16dc
... ... @@ -72,7 +72,6 @@
72 72  
73 73 static void button_script(GtkButton *button, GtkWidget *widget)
74 74 {
75   - v3270_run_script(widget,g_object_get_data(G_OBJECT(button),"script_text"));
76 75 }
77 76  
78 77 void keypad_button_start(GMarkupParseContext *context, const gchar **names,const gchar **values, GError **error, struct keypad *keypad)
... ...