aboutsummaryrefslogtreecommitdiffstats
path: root/gtk/flow_graph.c
diff options
context:
space:
mode:
authorStephen Fisher <steve@stephen-fisher.com>2007-05-29 23:09:09 +0000
committerStephen Fisher <steve@stephen-fisher.com>2007-05-29 23:09:09 +0000
commit5eb2b42d3016469b314d9b67e90aac8c5ec8012f (patch)
treec3c088ede97fc1bd35626102a2d7bc9000efa3a6 /gtk/flow_graph.c
parentf93cf6dd8695731a7a854de4f1c9312d4d60c129 (diff)
Fix for bug #1530: Graph Analysis window misbehaves if Flow Window that
created it is closed. The fix is to close the graph analysis window when the flow graph setup window is closed since closing the flow graph window first destroys all of the data structures. svn path=/trunk/; revision=21994
Diffstat (limited to 'gtk/flow_graph.c')
-rw-r--r--gtk/flow_graph.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/gtk/flow_graph.c b/gtk/flow_graph.c
index ef0d0202e4..f92ac624b5 100644
--- a/gtk/flow_graph.c
+++ b/gtk/flow_graph.c
@@ -406,7 +406,7 @@ static void flow_graph_packet_draw(void *prs _U_)
/****************************************************************************/
static void
flow_graph_on_ok (GtkButton *button _U_,
- gpointer user_data _U_)
+ gpointer user_data)
{
if ((have_frame_tap_listener==TRUE)
@@ -455,6 +455,7 @@ flow_graph_on_ok (GtkButton *button _U_,
graph_analysis_update(graph_analysis_data); /* refresh it xxx */
}
else{
+ graph_analysis_data->dlg.parent_w = user_data;
graph_analysis_create(graph_analysis_data);
}
@@ -617,7 +618,7 @@ static void flow_graph_dlg_create (void)
bt_ok = BUTTON_NEW_FROM_STOCK(GTK_STOCK_OK);
gtk_container_add(GTK_CONTAINER(hbuttonbox), bt_ok);
gtk_tooltips_set_tip (tooltips, bt_ok, "Show the flow graph", NULL);
- SIGNAL_CONNECT(bt_ok, "clicked", flow_graph_on_ok, NULL);
+ SIGNAL_CONNECT(bt_ok, "clicked", flow_graph_on_ok, flow_graph_dlg_w);
gtk_widget_show(bt_ok);
bt_close = BUTTON_NEW_FROM_STOCK(GTK_STOCK_CLOSE);