diff --git a/src/dialogs/commondialog.c b/src/dialogs/commondialog.c index 3b22ca2..625dcc2 100644 --- a/src/dialogs/commondialog.c +++ b/src/dialogs/commondialog.c @@ -69,15 +69,15 @@ LIB3270_EXPORT GtkWidget * v3270_dialog_new(const gchar *title, GtkWindow *paren if(parent) { - gtk_window_set_transient_for(GTK_WINDOW(dialog), GTK_WINDOW(parent)); + gtk_window_set_transient_for(GTK_WINDOW(dialog), GTK_WINDOW(gtk_widget_get_toplevel(parent))); gtk_window_set_modal(GTK_WINDOW(dialog), TRUE); gtk_window_set_destroy_with_parent(GTK_WINDOW(dialog), TRUE); } - GtkWidget * header = gtk_dialog_get_header_bar(GTK_DIALOG(dialog)); - - if(header) + if(use_header) { + GtkWidget * header = gtk_dialog_get_header_bar(GTK_DIALOG(dialog)); + gtk_header_bar_set_title(GTK_HEADER_BAR(header),title); gtk_header_bar_pack_start(GTK_HEADER_BAR(header),create_button(dialog,_("_Cancel"),G_CALLBACK(cancel_clicked))); gtk_header_bar_pack_end(GTK_HEADER_BAR(header),create_button(dialog,apply,G_CALLBACK(apply_clicked))); diff --git a/src/include/v3270/filetransfer.h b/src/include/v3270/filetransfer.h index b5a1c96..e145493 100644 --- a/src/include/v3270/filetransfer.h +++ b/src/include/v3270/filetransfer.h @@ -141,9 +141,6 @@ typedef struct _V3270FTDialog V3270FTDialog; typedef struct _V3270FTDialogClass V3270FTDialogClass; - LIB3270_EXPORT GtkWidget * v3270_ft_dialog_new(GtkWidget *parent); - - G_END_DECLS #endif // V3270FT_H_INCLUDED diff --git a/src/v3270ft/dialog.c b/src/v3270ft/dialog.c index 8dd6a02..0f12566 100644 --- a/src/v3270ft/dialog.c +++ b/src/v3270ft/dialog.c @@ -322,7 +322,7 @@ static void V3270FTDialog_init(V3270FTDialog *widget) // gtk_widget_set_sensitive(widget->button.begin,FALSE); gtk_widget_set_tooltip_markup(widget->button.begin,_("Start transfer")); - +/* #ifdef DEBUG GObject * activity = v3270_ft_activity_new(); @@ -332,6 +332,7 @@ static void V3270FTDialog_init(V3270FTDialog *widget) v3270_activity_list_append(widget->queue.view,activity); #endif // DEBUG +*/ } -- libgit2 0.21.2