diff --git a/src/pw3270/colors.c b/src/pw3270/colors.c index 282ef94..6dd1e6d 100644 --- a/src/pw3270/colors.c +++ b/src/pw3270/colors.c @@ -473,8 +473,8 @@ static void load_color_scheme(GKeyFile *conf, const gchar *group, GdkRGBA *clr) GtkWidget * dialog = gtk_dialog_new_with_buttons ( gettext(title ? title : N_( "Color setup") ), GTK_WINDOW(gtk_widget_get_toplevel(widget)), GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT, + GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, NULL ); #if GTK_CHECK_VERSION(3,0,0) GtkWidget * panned = gtk_box_new(GTK_ORIENTATION_HORIZONTAL,2); diff --git a/src/pw3270/ft/ftdialog.c b/src/pw3270/ft/ftdialog.c index c92fc9d..ddfb7dd 100644 --- a/src/pw3270/ft/ftdialog.c +++ b/src/pw3270/ft/ftdialog.c @@ -395,6 +395,10 @@ GtkWidget * v3270_ft_dialog_new(GtkWidget *parent, LIB3270_FT_OPTION options) gtk_widget_set_tooltip_text(GTK_WIDGET(browse),_("Select file")); g_signal_connect(G_OBJECT(browse),"clicked",G_CALLBACK(browse_file),dialog); + gtk_widget_set_tooltip_text(gtk_dialog_add_button(GTK_DIALOG(dialog),_( "_Cancel" ), GTK_RESPONSE_CANCEL), + (dialog->options & LIB3270_FT_OPTION_RECEIVE) != 0 ? _("Cancel download.") : _("Cancel upload.")); + + dialog->ready = gtk_dialog_add_button(GTK_DIALOG(dialog), (dialog->options & LIB3270_FT_OPTION_RECEIVE) != 0 ? _( "_Receive") : _( "_Send" ), GTK_RESPONSE_ACCEPT); @@ -404,10 +408,6 @@ GtkWidget * v3270_ft_dialog_new(GtkWidget *parent, LIB3270_FT_OPTION options) (dialog->options & LIB3270_FT_OPTION_RECEIVE) != 0 ? _("Start download.") : _("Start upload.")); - gtk_widget_set_tooltip_text(gtk_dialog_add_button(GTK_DIALOG(dialog),_( "_Cancel" ), GTK_RESPONSE_CANCEL), - (dialog->options & LIB3270_FT_OPTION_RECEIVE) != 0 ? _("Cancel download.") : _("Cancel upload.")); - - g_signal_connect(G_OBJECT(dialog->filename[FILENAME_HOST]),"changed",G_CALLBACK(test_remote_file),dialog); if(options & LIB3270_FT_OPTION_RECEIVE) diff --git a/src/pw3270/v3270/hostselect.c b/src/pw3270/v3270/hostselect.c index 5b59617..04cf4d1 100644 --- a/src/pw3270/v3270/hostselect.c +++ b/src/pw3270/v3270/hostselect.c @@ -386,8 +386,8 @@ LIB3270_EXPORT void v3270_select_host(GtkWidget *widget) _( "Select hostname" ), GTK_WINDOW(gtk_widget_get_toplevel(widget)), GTK_DIALOG_MODAL|GTK_DIALOG_DESTROY_WITH_PARENT, - _( "C_onnect" ), GTK_RESPONSE_ACCEPT, _( "_Cancel" ), GTK_RESPONSE_REJECT, + _( "C_onnect" ), GTK_RESPONSE_ACCEPT, NULL ); -- libgit2 0.21.2