diff options
| author | Stephen Fisher <steve@stephen-fisher.com> | 2007-06-17 00:54:58 +0000 |
|---|---|---|
| committer | Stephen Fisher <steve@stephen-fisher.com> | 2007-06-17 00:54:58 +0000 |
| commit | c4ba5ad2b0fab524a9545ec948b3465fbbcd7c30 (patch) | |
| tree | 743d8a5c8601fb493de461262978226ff831c458 /gtk/filter_dlg.c | |
| parent | e6345ad54dd0b81848b31efc5696aac8e35e713e (diff) | |
| download | wireshark-c4ba5ad2b0fab524a9545ec948b3465fbbcd7c30.tar.gz | |
Fix bug #1334 and a problem where a user couldn't interact with the
filter dialog's add expression dialog when going to it through file->open
or file->merge (because dialogs in between are set to modal).
svn path=/trunk/; revision=22115
Diffstat (limited to 'gtk/filter_dlg.c')
| -rw-r--r-- | gtk/filter_dlg.c | 28 |
1 files changed, 20 insertions, 8 deletions
diff --git a/gtk/filter_dlg.c b/gtk/filter_dlg.c index 12f5484fbd..3d3ea1b10f 100644 --- a/gtk/filter_dlg.c +++ b/gtk/filter_dlg.c @@ -407,6 +407,7 @@ filter_dialog_new(GtkWidget *button, GtkWidget *parent_filter_te, *filter_fr, *edit_fr, *props_fr; + GdkWindow *parent; GtkTooltips *tooltips; static filter_list_type_t cfilter_list_type = CFILTER_EDITED_LIST; static filter_list_type_t dfilter_list_type = DFILTER_EDITED_LIST; @@ -453,12 +454,6 @@ filter_dialog_new(GtkWidget *button, GtkWidget *parent_filter_te, gtk_window_set_default_size(GTK_WINDOW(main_w), 400, 400); OBJECT_SET_DATA(main_w, E_FILT_CONSTRUCT_ARGS_KEY, construct_args); - if(construct_args->modal_and_transient) { - GdkWindow* parent = gtk_widget_get_parent_window(parent_filter_te); - gtk_window_set_transient_for(GTK_WINDOW(main_w), GTK_WINDOW(parent)); - gtk_window_set_modal(GTK_WINDOW(main_w), TRUE); - } - main_vb = gtk_vbox_new(FALSE, 0); gtk_container_border_width(GTK_CONTAINER(main_vb), 5); gtk_container_add(GTK_CONTAINER(main_w), main_vb); @@ -699,6 +694,12 @@ filter_dialog_new(GtkWidget *button, GtkWidget *parent_filter_te, gtk_widget_show(main_w); + if(construct_args->modal_and_transient) { + parent = gtk_widget_get_parent_window(parent_filter_te); + gdk_window_set_transient_for(main_w->window, parent); + gtk_window_set_modal(GTK_WINDOW(main_w), TRUE); + } + /* hide the Ok button, if we don't have to apply it and our caller wants a Save button */ if (parent_filter_te == NULL && prefs.gui_use_pref_save) { gtk_widget_hide(ok_bt); @@ -1429,10 +1430,21 @@ void filter_add_expr_bt_cb(GtkWidget *w _U_, gpointer main_w_arg) { GtkWidget *main_w = GTK_WIDGET(main_w_arg); - GtkWidget *filter_te; + GtkWidget *filter_te, *dfilter_w; filter_te = OBJECT_GET_DATA(main_w, E_FILT_FILTER_TE_KEY); - dfilter_expr_dlg_new(filter_te); + dfilter_w = dfilter_expr_dlg_new(filter_te); + + /* If we're opening a series of modal dialogs (such as when going + * through file->open, make the latest dialog modal also so that it + * takes over "control" from the other modal dialogs. Also set + * the transient property of the new dialog so the user doesn't try + * to interact with the previous window when they can't. */ + if(gtk_window_get_modal(GTK_WINDOW(main_w))) { + gtk_window_set_modal(GTK_WINDOW(dfilter_w), TRUE); + gtk_window_set_transient_for(GTK_WINDOW(dfilter_w), + GTK_WINDOW(main_w)); + } } static void |