Change window_new() to dlg_window_new() and destroy the window with the top level window.

svn path=/trunk/; revision=28810

18 files changed, 41 insertions, 25 deletions

diff --git a/gtk/hostlist_table.c b/gtk/hostlist_table.c
index 17de231ef1..5e0b2db34e 100644
--- a/gtk/hostlist_table.c
+++ b/gtk/hostlist_table.c
@@ -1147,7 +1147,9 @@ init_hostlist_notebook_cb(GtkWidget *w _U_, gpointer d _U_)
 
     pages = g_malloc(sizeof(void *) * (g_slist_length(registered_hostlist_tables) + 1));
 
-    win=window_new(GTK_WINDOW_TOPLEVEL, "hostlist");
+	win = dlg_window_new("hostlist");  /* transient_for top_level */
+	gtk_window_set_destroy_with_parent (GTK_WINDOW(win), TRUE);
+
     g_snprintf(title, sizeof(title), "Endpoints: %s", cf_get_display_name(&cfile));
     gtk_window_set_title(GTK_WINDOW(win), title);
     gtk_window_set_default_size(GTK_WINDOW(win), 750, 400);
diff --git a/gtk/mgcp_stat.c b/gtk/mgcp_stat.c
index 0ca343d2ca..baf73e76d2 100644
--- a/gtk/mgcp_stat.c
+++ b/gtk/mgcp_stat.c
@@ -264,7 +264,9 @@ gtk_mgcpstat_init(const char *optarg, void *userdata _U_)
 
 	mgcpstat_reset(ms);
 
-	ms->win=window_new(GTK_WINDOW_TOPLEVEL, "MGCP SRT");
+	ms->win = dlg_window_new("MGCP SRT");  /* transient_for top_level */
+	gtk_window_set_destroy_with_parent (GTK_WINDOW(ms->win), TRUE);
+
 	gtk_window_set_default_size(GTK_WINDOW(ms->win), 550, 150);
 
 	ms->vbox=gtk_vbox_new(FALSE, 3);
diff --git a/gtk/mtp3_stat.c b/gtk/mtp3_stat.c
index f9b4d6603a..3c1ade3fc5 100644
--- a/gtk/mtp3_stat.c
+++ b/gtk/mtp3_stat.c
@@ -370,7 +370,9 @@ mtp3_stat_gtk_win_create(
     GtkWidget		*bbox;
 
 
-    dlg_p->win = window_new(GTK_WINDOW_TOPLEVEL, title);
+	dlg_p->win = dlg_window_new(title);  /* transient_for top_level */
+	gtk_window_set_destroy_with_parent (GTK_WINDOW(dlg_p->win), TRUE);
+
     gtk_window_set_default_size(GTK_WINDOW(dlg_p->win), 640, 390);
 
     vbox = gtk_vbox_new(FALSE, 3);
diff --git a/gtk/mtp3_summary.c b/gtk/mtp3_summary.c
index 4c263f4f7e..12cdd1140b 100644
--- a/gtk/mtp3_summary.c
+++ b/gtk/mtp3_summary.c
@@ -297,7 +297,8 @@ mtp3_sum_gtk_sum_cb(GtkWidget *w _U_, gpointer d _U_)
   /* initial compututations */
   seconds = summary.stop_time - summary.start_time;
 
-  sum_open_w = window_new(GTK_WINDOW_TOPLEVEL, "MTP3 Statistics: Summary");
+  sum_open_w = dlg_window_new("MTP3 Statistics: Summary");  /* transient_for top_level */
+  gtk_window_set_destroy_with_parent (GTK_WINDOW(sum_open_w), TRUE);
 
   /* Container for each row of widgets */
   main_vb = gtk_vbox_new(FALSE, 3);
diff --git a/gtk/ncp_stat.c b/gtk/ncp_stat.c
index 033a95d567..29838f0f8b 100644
--- a/gtk/ncp_stat.c
+++ b/gtk/ncp_stat.c
@@ -519,7 +519,8 @@ gtk_ncpstat_init(const char *optarg, void *userdata _U_)
 
     ss=g_malloc(sizeof(ncpstat_t));
 
-    ss->win=window_new(GTK_WINDOW_TOPLEVEL, "ncp-stat");
+	ss->win = dlg_window_new("ncp-stat");  /* transient_for top_level */
+	gtk_window_set_destroy_with_parent (GTK_WINDOW(ss->win), TRUE);
     gtk_window_set_default_size(GTK_WINDOW(ss->win), 300, 400);
 
     ncpstat_set_title(ss);
diff --git a/gtk/radius_stat.c b/gtk/radius_stat.c
index 1f0da9d7ba..91ed1f5a7f 100644
--- a/gtk/radius_stat.c
+++ b/gtk/radius_stat.c
@@ -315,7 +315,8 @@ gtk_radiusstat_init(const char *optarg, void *userdata _U_)
 
 	radiusstat_reset(rs);
 
-	rs->win=window_new(GTK_WINDOW_TOPLEVEL, "RADIUS SRT");
+	rs->win = dlg_window_new("RADIUS SRT");  /* transient_for top_level */
+	gtk_window_set_destroy_with_parent (GTK_WINDOW(rs->win), TRUE);
 	gtk_window_set_default_size(GTK_WINDOW(rs->win), 600, 150);
 
 	rs->vbox=gtk_vbox_new(FALSE, 3);
diff --git a/gtk/rpc_progs.c b/gtk/rpc_progs.c
index e51c64bdd0..5c955f07f2 100644
--- a/gtk/rpc_progs.c
+++ b/gtk/rpc_progs.c
@@ -344,7 +344,8 @@ gtk_rpcprogs_init(const char *optarg _U_, void* userdata _U_)
 	}
 
 	title_string = rpcprogs_gen_title();
-	win=window_new(GTK_WINDOW_TOPLEVEL, title_string);
+	win = dlg_window_new(title_string);  /* transient_for top_level */
+	gtk_window_set_destroy_with_parent (GTK_WINDOW(win), TRUE);
 
 	vbox=gtk_vbox_new(FALSE, 3);
 	gtk_container_add(GTK_CONTAINER(win), vbox);
diff --git a/gtk/rpc_stat.c b/gtk/rpc_stat.c
index 08384278a2..16c90a6c12 100644
--- a/gtk/rpc_stat.c
+++ b/gtk/rpc_stat.c
@@ -256,7 +256,8 @@ gtk_rpcstat_init(const char *optarg, void* userdata _U_)
 	hf_index=rpc_prog_hf(rpc_program, rpc_version);
 	hfi=proto_registrar_get_nth(hf_index);
 
-	rs->win=window_new(GTK_WINDOW_TOPLEVEL, "rpc-stat");
+	rs->win = dlg_window_new("rpc-stat");  /* transient_for top_level */
+	gtk_window_set_destroy_with_parent (GTK_WINDOW(rs->win), TRUE);
 	gtk_window_set_default_size(GTK_WINDOW(rs->win), 550, 400);
 	rpcstat_set_title(rs);
 
diff --git a/gtk/rtp_player.c b/gtk/rtp_player.c
index ddd06a23ba..cadcb1d5aa 100644
--- a/gtk/rtp_player.c
+++ b/gtk/rtp_player.c
@@ -1985,11 +1985,11 @@ rtp_player_dlg_create(void)
 
 	GtkTooltips *tooltips = gtk_tooltips_new();
 
-	rtp_player_dlg_w=gtk_window_new(GTK_WINDOW_TOPLEVEL);
-
 	title_name_ptr = cf_get_display_name(&cfile);
 	win_name = g_strdup_printf("%s - VoIP - RTP Player", title_name_ptr);	
-	gtk_window_set_title(GTK_WINDOW(rtp_player_dlg_w), win_name);
+
+	rtp_player_dlg_w = dlg_window_new(win_name);  /* transient_for top_level */
+	gtk_window_set_destroy_with_parent (GTK_WINDOW(rtp_player_dlg_w), TRUE);
 	gtk_window_set_position(GTK_WINDOW(rtp_player_dlg_w), GTK_WIN_POS_NONE);
 
 	gtk_window_set_default_size(GTK_WINDOW(rtp_player_dlg_w), 400, 50);
diff --git a/gtk/scsi_stat.c b/gtk/scsi_stat.c
index 4ce4a78821..1faebd4afa 100644
--- a/gtk/scsi_stat.c
+++ b/gtk/scsi_stat.c
@@ -235,7 +235,8 @@ gtk_scsistat_init(const char *optarg, void* userdata _U_)
 		break;
 	}
 
-	rs->win=window_new(GTK_WINDOW_TOPLEVEL, "scsi-stat");
+	rs->win = dlg_window_new("scsi-stat");  /* transient_for top_level */
+	gtk_window_set_destroy_with_parent (GTK_WINDOW(rs->win), TRUE);
 	gtk_window_set_default_size(GTK_WINDOW(rs->win), 550, 400);
 	scsistat_set_title(rs);
 
diff --git a/gtk/sctp_byte_graph_dlg.c b/gtk/sctp_byte_graph_dlg.c
index 9445a093fc..2d1e802a2d 100644
--- a/gtk/sctp_byte_graph_dlg.c
+++ b/gtk/sctp_byte_graph_dlg.c
@@ -1043,9 +1043,8 @@ static void init_sctp_graph_window(struct sctp_udata *u_data)
 
 	/* create the main window */
 
-	u_data->io->window=gtk_window_new(GTK_WINDOW_TOPLEVEL);
-
-	gtk_widget_set_name(u_data->io->window, "SCTP Graphics");
+	u_data->io->window = dlg_window_new("SCTP Graphics");  /* transient_for top_level */
+	gtk_window_set_destroy_with_parent (GTK_WINDOW(u_data->io->window), TRUE);
 
 	vbox=gtk_vbox_new(FALSE, 0);
 	gtk_container_add(GTK_CONTAINER(u_data->io->window), vbox);
diff --git a/gtk/sctp_chunk_stat.c b/gtk/sctp_chunk_stat.c
index addd2a1a7f..daeb011f9d 100644
--- a/gtk/sctp_chunk_stat.c
+++ b/gtk/sctp_chunk_stat.c
@@ -298,7 +298,8 @@ sctpstat_init(const char *optarg, void *userdata _U_)
 	hs->number_of_packets = 0;
 	sctpstat_reset(hs);
 
-	hs->win=window_new(GTK_WINDOW_TOPLEVEL, "Wireshark: SCTP Chunk Statistics");
+	hs->win = dlg_window_new("Wireshark: SCTP Chunk Statistics");  /* transient_for top_level */
+	gtk_window_set_destroy_with_parent (GTK_WINDOW(hs->win), TRUE);
 	gtk_window_set_default_size(GTK_WINDOW(hs->win), 600, 200);
 
 	hs->vbox=gtk_vbox_new(FALSE, 3);
diff --git a/gtk/sctp_graph_dlg.c b/gtk/sctp_graph_dlg.c
index a672810ae1..051d89d5c4 100644
--- a/gtk/sctp_graph_dlg.c
+++ b/gtk/sctp_graph_dlg.c
@@ -1346,10 +1346,8 @@ static void init_sctp_graph_window(struct sctp_udata *u_data)
 	GtkTooltips *tooltip_in, *tooltip_out;
 
 	/* create the main window */
-
-	u_data->io->window=gtk_window_new(GTK_WINDOW_TOPLEVEL);
-
-	gtk_widget_set_name(u_data->io->window, "SCTP Graphics");
+	u_data->io->window= dlg_window_new("WSCTP Graphics");  /* transient_for top_level */
+	gtk_window_set_destroy_with_parent (GTK_WINDOW(u_data->io->window), TRUE);
 
 	vbox=gtk_vbox_new(FALSE, 0);
 	gtk_container_add(GTK_CONTAINER(u_data->io->window), vbox);
diff --git a/gtk/sip_stat.c b/gtk/sip_stat.c
index 34289221a5..59c0990254 100644
--- a/gtk/sip_stat.c
+++ b/gtk/sip_stat.c
@@ -566,7 +566,8 @@ gtk_sipstat_init(const char *optarg, void *userdata _U_)
 
     /* Create sip stats window structure */
     sp = g_malloc(sizeof(sipstat_t));
-    sp->win = window_new(GTK_WINDOW_TOPLEVEL, "sip-stat");
+	sp->win = dlg_window_new("sip-stat");  /* transient_for top_level */
+	gtk_window_set_destroy_with_parent (GTK_WINDOW(sp->win), TRUE);
 
     /* Set title to include any filter given */
     if (filter)
diff --git a/gtk/smb2_stat.c b/gtk/smb2_stat.c
index 03ffbff3f3..f1b46d4c22 100644
--- a/gtk/smb2_stat.c
+++ b/gtk/smb2_stat.c
@@ -147,7 +147,8 @@ gtk_smb2stat_init(const char *optarg, void *userdata _U_)
 
 	ss=g_malloc(sizeof(smb2stat_t));
 
-	ss->win=window_new(GTK_WINDOW_TOPLEVEL, "smb2-stat");
+	ss->win = dlg_window_new("smb2-stat");  /* transient_for top_level */
+	gtk_window_set_destroy_with_parent (GTK_WINDOW(ss->win), TRUE);
 	gtk_window_set_default_size(GTK_WINDOW(ss->win), 550, 400);
 	smb2stat_set_title(ss);
 
diff --git a/gtk/smb_stat.c b/gtk/smb_stat.c
index 6b4079a4fe..60a63d5d3b 100644
--- a/gtk/smb_stat.c
+++ b/gtk/smb_stat.c
@@ -169,7 +169,8 @@ gtk_smbstat_init(const char *optarg, void *userdata _U_)
 
 	ss=g_malloc(sizeof(smbstat_t));
 
-	ss->win=window_new(GTK_WINDOW_TOPLEVEL, "smb-stat");
+	ss->win = dlg_window_new("smb-stat");  /* transient_for top_level */
+	gtk_window_set_destroy_with_parent (GTK_WINDOW(ss->win), TRUE);
 	gtk_window_set_default_size(GTK_WINDOW(ss->win), 550, 600);
 	smbstat_set_title(ss);
 
diff --git a/gtk/voip_calls_dlg.c b/gtk/voip_calls_dlg.c
index 75ed4c5fdc..1c21b4aa8c 100644
--- a/gtk/voip_calls_dlg.c
+++ b/gtk/voip_calls_dlg.c
@@ -681,7 +681,8 @@ static void voip_calls_dlg_create (void)
 
 	title_name_ptr = cf_get_display_name(&cfile);
 	win_name = g_strdup_printf("%s - VoIP Calls", title_name_ptr);
-	voip_calls_dlg_w=window_new(GTK_WINDOW_TOPLEVEL, win_name);
+	voip_calls_dlg_w = dlg_window_new(win_name);  /* transient_for top_level */
+	gtk_window_set_destroy_with_parent (GTK_WINDOW(voip_calls_dlg_w), TRUE);
 
 	gtk_window_set_default_size(GTK_WINDOW(voip_calls_dlg_w), 840, 350);
 
diff --git a/gtk/wsp_stat.c b/gtk/wsp_stat.c
index 4c3f1a01f5..3b14133586 100644
--- a/gtk/wsp_stat.c
+++ b/gtk/wsp_stat.c
@@ -323,7 +323,9 @@ gtk_wspstat_init(const char *optarg, void *userdata _U_)
 	}
 
 	sp = g_malloc( sizeof(wspstat_t) );
-	sp->win = window_new(GTK_WINDOW_TOPLEVEL, "wsp-stat");
+	sp->win = dlg_window_new("wsp-stat");  /* transient_for top_level */
+	gtk_window_set_destroy_with_parent (GTK_WINDOW(sp->win), TRUE);
+
 	sp->hash = g_hash_table_new( g_int_hash, g_int_equal);
 	for (i=0 ; vals_status[i].strptr ; i++ )
 	{