Commit 6eb626b11033bf81dffa4b25ebfeae5a09e2579d
1 parent
847353a3
Exists in
master
and in
5 other branches
Updating main application.
Showing
7 changed files
with
13 additions
and
13 deletions
Show diff stats
modules/lib3270
modules/libv3270
src/plugins/dbus3270/gobject.c
@@ -104,7 +104,7 @@ void pw3270_dbus_connect(PW3270Dbus *object, const gchar *uri, DBusGMethodInvoca | @@ -104,7 +104,7 @@ void pw3270_dbus_connect(PW3270Dbus *object, const gchar *uri, DBusGMethodInvoca | ||
104 | g_message("%s","Connecting by remote request"); | 104 | g_message("%s","Connecting by remote request"); |
105 | } | 105 | } |
106 | 106 | ||
107 | - dbus_g_method_return(context,lib3270_connect(hSession,0)); | 107 | + dbus_g_method_return(context,lib3270_reconnect(hSession,0)); |
108 | } | 108 | } |
109 | 109 | ||
110 | void pw3270_dbus_set_ur_l(PW3270Dbus *object, const gchar *uri, DBusGMethodInvocation *context) | 110 | void pw3270_dbus_set_ur_l(PW3270Dbus *object, const gchar *uri, DBusGMethodInvocation *context) |
src/pw3270/actions.c
@@ -83,7 +83,7 @@ static void connect_action(GtkAction *action, GtkWidget *widget) | @@ -83,7 +83,7 @@ static void connect_action(GtkAction *action, GtkWidget *widget) | ||
83 | v3270_set_url(widget,host); | 83 | v3270_set_url(widget,host); |
84 | 84 | ||
85 | if(systype) | 85 | if(systype) |
86 | - v3270_set_host_type(widget,systype); | 86 | + v3270_set_host_type_by_name(widget,systype); |
87 | 87 | ||
88 | if(colortype) | 88 | if(colortype) |
89 | v3270_set_session_color_type(widget,atoi(colortype)); | 89 | v3270_set_session_color_type(widget,atoi(colortype)); |
@@ -91,7 +91,7 @@ static void connect_action(GtkAction *action, GtkWidget *widget) | @@ -91,7 +91,7 @@ static void connect_action(GtkAction *action, GtkWidget *widget) | ||
91 | host = v3270_get_hostname(widget); | 91 | host = v3270_get_hostname(widget); |
92 | if(host && *host) | 92 | if(host && *host) |
93 | { | 93 | { |
94 | - v3270_connect(widget); | 94 | + v3270_reconnect(widget); |
95 | return; | 95 | return; |
96 | } | 96 | } |
97 | 97 |
src/pw3270/globals.h
@@ -62,7 +62,7 @@ | @@ -62,7 +62,7 @@ | ||
62 | G_GNUC_INTERNAL void setup_font_list(GtkWidget *widget, GtkWidget *obj); | 62 | G_GNUC_INTERNAL void setup_font_list(GtkWidget *widget, GtkWidget *obj); |
63 | G_GNUC_INTERNAL void load_color_schemes(GtkWidget *widget, gchar *active); | 63 | G_GNUC_INTERNAL void load_color_schemes(GtkWidget *widget, gchar *active); |
64 | G_GNUC_INTERNAL GtkWidget * color_scheme_new(const GdkRGBA *current); | 64 | G_GNUC_INTERNAL GtkWidget * color_scheme_new(const GdkRGBA *current); |
65 | - G_GNUC_INTERNAL LIB3270_OPTION pw3270_options_by_hosttype(const gchar *systype); | 65 | +// G_GNUC_INTERNAL LIB3270_OPTION pw3270_options_by_hosttype(const gchar *systype); |
66 | G_GNUC_INTERNAL void run_security_dialog(GtkWidget *widget); | 66 | G_GNUC_INTERNAL void run_security_dialog(GtkWidget *widget); |
67 | 67 | ||
68 | // actions | 68 | // actions |
src/pw3270/hostdialog.c
@@ -41,7 +41,7 @@ | @@ -41,7 +41,7 @@ | ||
41 | 41 | ||
42 | ptr = get_string_from_config("host","systype","s390"); | 42 | ptr = get_string_from_config("host","systype","s390"); |
43 | if(*ptr) | 43 | if(*ptr) |
44 | - lib3270_set_host_type(hSession,ptr); | 44 | + lib3270_set_host_type_by_name(hSession,ptr); |
45 | g_free(ptr); | 45 | g_free(ptr); |
46 | 46 | ||
47 | v3270_select_host(widget); | 47 | v3270_select_host(widget); |
src/pw3270/window.c
@@ -327,7 +327,7 @@ | @@ -327,7 +327,7 @@ | ||
327 | void pw3270_connect(GtkWidget *widget) | 327 | void pw3270_connect(GtkWidget *widget) |
328 | { | 328 | { |
329 | g_return_if_fail(GTK_IS_PW3270(widget)); | 329 | g_return_if_fail(GTK_IS_PW3270(widget)); |
330 | - v3270_connect(GTK_PW3270(widget)->terminal); | 330 | + v3270_reconnect(GTK_PW3270(widget)->terminal); |
331 | } | 331 | } |
332 | 332 | ||
333 | void pw3270_set_url(GtkWidget *widget, const gchar *uri) | 333 | void pw3270_set_url(GtkWidget *widget, const gchar *uri) |
@@ -398,7 +398,7 @@ | @@ -398,7 +398,7 @@ | ||
398 | 398 | ||
399 | g_return_if_fail(GTK_IS_PW3270(widget)); | 399 | g_return_if_fail(GTK_IS_PW3270(widget)); |
400 | 400 | ||
401 | - int rc = v3270_set_host_type(GTK_PW3270(widget)->terminal,name); | 401 | + int rc = v3270_set_host_type_by_name(GTK_PW3270(widget)->terminal,name); |
402 | 402 | ||
403 | if(!rc) { | 403 | if(!rc) { |
404 | return; | 404 | return; |
@@ -414,18 +414,18 @@ | @@ -414,18 +414,18 @@ | ||
414 | 414 | ||
415 | // Obtenho as opções válidas. | 415 | // Obtenho as opções válidas. |
416 | char text[4096]; | 416 | char text[4096]; |
417 | - const LIB3270_OPTION_ENTRY *host_type = lib3270_get_option_list(); | 417 | + const LIB3270_HOST_TYPE_ENTRY * host_types = lib3270_get_option_list(); |
418 | 418 | ||
419 | *text = 0; | 419 | *text = 0; |
420 | - for(f=1;host_type[f].name;f++) | 420 | + for(f=1;host_types[f].name;f++) |
421 | { | 421 | { |
422 | sz = strlen(text); | 422 | sz = strlen(text); |
423 | - snprintf(text+sz,4095-sz,_( "%s<b>%s</b> for %s"), *text ? ", " : "",host_type[f].name,gettext(host_type[f].description)); | 423 | + snprintf(text+sz,4095-sz,_( "%s<b>%s</b> for %s"), *text ? ", " : "",host_types[f].name,gettext(host_types[f].description)); |
424 | 424 | ||
425 | } | 425 | } |
426 | 426 | ||
427 | sz = strlen(text); | 427 | sz = strlen(text); |
428 | - snprintf(text+sz,4095-sz,_( " and <b>%s</b> for %s."),host_type[0].name,gettext(host_type[0].description)); | 428 | + snprintf(text+sz,4095-sz,_( " and <b>%s</b> for %s."),host_types[0].name,gettext(host_types[0].description)); |
429 | 429 | ||
430 | gtk_message_dialog_format_secondary_markup(GTK_MESSAGE_DIALOG(popup),_( "The known types are %s" ),text); | 430 | gtk_message_dialog_format_secondary_markup(GTK_MESSAGE_DIALOG(popup),_( "The known types are %s" ),text); |
431 | 431 |