diff options
| author | Stig Bjørlykke <stig@bjorlykke.org> | 2011-11-02 20:06:40 +0000 |
|---|---|---|
| committer | Stig Bjørlykke <stig@bjorlykke.org> | 2011-11-02 20:06:40 +0000 |
| commit | 66b220330acb0fca61e059af73e9191e30889297 (patch) | |
| tree | 792a673129e3ee8f03eb01a2640acfba2fda017f /gtk | |
| parent | b0ceb1cc770ed84cd6e959fa38411eb97c99b8ec (diff) | |
Revert revision 39665 (for bug 6472) which introduced bug 6537.
svn path=/trunk/; revision=39719
Diffstat (limited to 'gtk')
| -rw-r--r-- | gtk/dfilter_expr_dlg.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/gtk/dfilter_expr_dlg.c b/gtk/dfilter_expr_dlg.c index 1b6f6e759f..db43dc2f72 100644 --- a/gtk/dfilter_expr_dlg.c +++ b/gtk/dfilter_expr_dlg.c @@ -76,8 +76,6 @@ typedef struct protocol_data { int hfinfo_index; } protocol_data_t; -static GtkWidget *window; - static void show_relations(GtkWidget *relation_list, ftenum_t ftype); static gboolean relation_is_presence_test(const char *string); static void add_relation_list(GtkWidget *relation_list, const char *relation, gboolean sensitive); @@ -902,7 +900,7 @@ dfilter_expr_dlg_destroy_cb(GtkWidget *w, gpointer filter_te) GtkWidget * dfilter_expr_dlg_new(GtkWidget *filter_te) { - GtkWidget *main_vb, *main_hb; + GtkWidget *window, *main_vb, *main_hb; GtkWidget *field_vb, *field_tree_lb, *field_tree, *tree_scrolled_win; @@ -927,13 +925,7 @@ dfilter_expr_dlg_new(GtkWidget *filter_te) GtkListStore *l_store; GtkTreeSelection *l_sel; - if (window != NULL) { - /* There's already an "Expression" dialog box; reactivate it. */ - reactivate_window(window); - return window; - } - - proto_initialize_all_prefixes(); + proto_initialize_all_prefixes(); window = dlg_conf_window_new("Wireshark: Filter Expression"); gtk_window_set_default_size(GTK_WINDOW(window), 500, 400); |