diff options
| author | Stephen Fisher <steve@stephen-fisher.com> | 2007-05-30 19:43:33 +0000 |
|---|---|---|
| committer | Stephen Fisher <steve@stephen-fisher.com> | 2007-05-30 19:43:33 +0000 |
| commit | c638ab8e6d484b3f1c887992035c9b73ecc4a004 (patch) | |
| tree | 51e7140772cd4b3d65c955ff7d1e43325e832428 /gtk | |
| parent | 164d604cb8fc8f76cdc340c1d7e681261bbca7b8 (diff) | |
Fix bug #1530 this time for GTK1 builds.
svn path=/trunk/; revision=22009
Diffstat (limited to 'gtk')
| -rw-r--r-- | gtk/flow_graph.c | 7 | ||||
| -rw-r--r-- | gtk/graph_analysis.c | 4 |
2 files changed, 9 insertions, 2 deletions
diff --git a/gtk/flow_graph.c b/gtk/flow_graph.c index f92ac624b5..eb82e8660f 100644 --- a/gtk/flow_graph.c +++ b/gtk/flow_graph.c @@ -140,6 +140,13 @@ remove_tap_listener_flow_graph(void) static void flow_graph_on_destroy(GtkObject *object _U_, gpointer user_data _U_) { +#if GTK_MAJOR_VERSION < 2 + /* Destroy the graph analysis window when we're destroyed. This is + * handled under GTK2 with a call to gtk_window_set_destroy_with_parent + * in graph_analysis.c */ + window_destroy(graph_analysis_data->dlg.window); +#endif + /* remove_tap_listeners */ remove_tap_listener_flow_graph(); diff --git a/gtk/graph_analysis.c b/gtk/graph_analysis.c index e1527241f5..f10164fa7c 100644 --- a/gtk/graph_analysis.c +++ b/gtk/graph_analysis.c @@ -1662,8 +1662,8 @@ static void dialog_graph_create_window(graph_analysis_data_t* user_data) gtk_window_set_transient_for(GTK_WINDOW(user_data->dlg.window), GTK_WINDOW(user_data->dlg.parent_w)); #if GTK_MAJOR_VERSION >= 2 - /* XXX - This function only works in GTK2. We need to find similar functionality - * for GTK1. See bug #1530. */ + /* Destruction of this child window in GTK1 is handled by a call + * to destroy_window() in flow_graph.c. */ gtk_window_set_destroy_with_parent(GTK_WINDOW(user_data->dlg.window), TRUE); #endif } |