Commit fca2a28f7dae3eaa34cec1e5c1ec31c884ff1c99

Authored by Perry Werneck
1 parent 6a064b26
Exists in v5.2

Fixing charset issue.

src/pw3270/hostdialog.c
@@ -49,6 +49,7 @@ @@ -49,6 +49,7 @@
49 set_string_to_config("terminal","oversize",pw3270_get_oversize(gtk_widget_get_toplevel(widget))); 49 set_string_to_config("terminal","oversize",pw3270_get_oversize(gtk_widget_get_toplevel(widget)));
50 set_integer_to_config("terminal","model_number",lib3270_get_model_number(hSession)); 50 set_integer_to_config("terminal","model_number",lib3270_get_model_number(hSession));
51 set_string_to_config("terminal","model_name","%s",lib3270_get_model_name(hSession)); 51 set_string_to_config("terminal","model_name","%s",lib3270_get_model_name(hSession));
  52 + set_string_to_config("terminal","host_charset",lib3270_get_host_charset(hSession));
52 53
53 } 54 }
54 55
src/pw3270/main.c
@@ -61,7 +61,7 @@ @@ -61,7 +61,7 @@
61 static const gchar * systype = NULL; 61 static const gchar * systype = NULL;
62 static const gchar * toggleset = NULL; 62 static const gchar * toggleset = NULL;
63 static const gchar * togglereset = NULL; 63 static const gchar * togglereset = NULL;
64 - static const gchar * charset = NULL; 64 + static const gchar * charset = "bracket";
65 static const gchar * remap = NULL; 65 static const gchar * remap = NULL;
66 static const gchar * model = NULL; 66 static const gchar * model = NULL;
67 static const gchar * oversize = NULL; 67 static const gchar * oversize = NULL;
@@ -347,7 +347,7 @@ int main(int argc, char *argv[]) @@ -347,7 +347,7 @@ int main(int argc, char *argv[])
347 { "systype", 't', 0, G_OPTION_ARG_STRING, &systype, N_( "Host system type" ), "S390" }, 347 { "systype", 't', 0, G_OPTION_ARG_STRING, &systype, N_( "Host system type" ), "S390" },
348 { "toggleset", 'S', 0, G_OPTION_ARG_STRING, &toggleset, N_( "Set toggles ON" ), NULL }, 348 { "toggleset", 'S', 0, G_OPTION_ARG_STRING, &toggleset, N_( "Set toggles ON" ), NULL },
349 { "togglereset", 'R', 0, G_OPTION_ARG_STRING, &togglereset, N_( "Set toggles OFF" ), NULL }, 349 { "togglereset", 'R', 0, G_OPTION_ARG_STRING, &togglereset, N_( "Set toggles OFF" ), NULL },
350 - { "charset", 'C', 0, G_OPTION_ARG_STRING, &charset, N_( "Set host charset" ), NULL }, 350 + { "charset", 'C', 0, G_OPTION_ARG_STRING, &charset, N_( "Set host charset" ), "bracket" },
351 { "remap", 'm', 0, G_OPTION_ARG_FILENAME, &remap, N_( "Remap charset from xml file" ), NULL }, 351 { "remap", 'm', 0, G_OPTION_ARG_FILENAME, &remap, N_( "Remap charset from xml file" ), NULL },
352 { "model", 'M', 0, G_OPTION_ARG_STRING, &model, N_( "The model of 3270 display to be emulated" ), NULL }, 352 { "model", 'M', 0, G_OPTION_ARG_STRING, &model, N_( "The model of 3270 display to be emulated" ), NULL },
353 { "oversize", 'O', 0, G_OPTION_ARG_STRING, &oversize, N_( "Makes the screen larger than the default for the chosen model number." ), NULL }, 353 { "oversize", 'O', 0, G_OPTION_ARG_STRING, &oversize, N_( "Makes the screen larger than the default for the chosen model number." ), NULL },
src/pw3270/tools.c
@@ -314,11 +314,6 @@ LIB3270_EXPORT void pw3270_set_host_charset(GtkWidget *widget, const gchar *name @@ -314,11 +314,6 @@ LIB3270_EXPORT void pw3270_set_host_charset(GtkWidget *widget, const gchar *name
314 g_signal_connect(dialog,"response",G_CALLBACK(gtk_widget_destroy),NULL); 314 g_signal_connect(dialog,"response",G_CALLBACK(gtk_widget_destroy),NULL);
315 gtk_widget_show_all(dialog); 315 gtk_widget_show_all(dialog);
316 316
317 - /*  
318 - gtk_dialog_run(GTK_DIALOG (dialog));  
319 - gtk_widget_destroy(dialog);  
320 - */  
321 -  
322 } 317 }
323 318
324 LIB3270_EXPORT void pw3270_set_action_state(GtkAction *action, gboolean on) 319 LIB3270_EXPORT void pw3270_set_action_state(GtkAction *action, gboolean on)