From Graeme Hewson:

	Don't crash if "-z" is used on the command line when a live
	capture is being done (e.g., with "-k -S" - in that case,
	"cfile.filename" is null when the window is created), just don't
	display the file name in the title.

	Don't set the title of a non-existent window - create the window
	first.

svn path=/trunk/; revision=8472

7 files changed, 65 insertions, 21 deletions

diff --git a/gtk/dcerpc_stat.c b/gtk/dcerpc_stat.c
index 6399c2d8d4..4a6737e8a6 100644
--- a/gtk/dcerpc_stat.c
+++ b/gtk/dcerpc_stat.c
@@ -1,7 +1,7 @@
 /* dcerpc_stat.c
  * dcerpc_stat   2002 Ronnie Sahlberg
  *
- * $Id: dcerpc_stat.c,v 1.17 2003/09/05 20:00:02 guy Exp $
+ * $Id: dcerpc_stat.c,v 1.18 2003/09/15 19:05:00 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -88,7 +88,10 @@ dcerpcstat_reset(rpcstat_t *rs)
 	char title_string[256];
 	reset_srt_table_data(&rs->srt_table);
 
-	snprintf(title_string, 255, "DCE-RPC Service Response Time statistics for %s version %d.%d : %s", rs->prog, rs->ver&0xff, rs->ver>>8, get_basename(cfile.filename));
+	if (cfile.filename)
+		snprintf(title_string, 255, "DCE-RPC Service Response Time statistics for %s version %d.%d : %s", rs->prog, rs->ver&0xff, rs->ver>>8, get_basename(cfile.filename));
+	else
+		snprintf(title_string, 255, "DCE-RPC Service Response Time statistics for %s version %d.%d", rs->prog, rs->ver&0xff, rs->ver>>8);
 	gtk_window_set_title(GTK_WINDOW(rs->win), title_string);
 }
 
@@ -212,7 +215,10 @@ gtk_dcerpcstat_init(char *optarg)
 
 	rs->win=gtk_window_new(GTK_WINDOW_TOPLEVEL);
 	gtk_window_set_default_size(GTK_WINDOW(rs->win), 550, 400);
-	snprintf(title_string, 255, "DCE-RPC Service Response Time statistics for %s version %d.%d : %s", rs->prog, rs->ver&0xff, rs->ver>>8, get_basename(cfile.filename));
+	if (cfile.filename)
+		snprintf(title_string, 255, "DCE-RPC Service Response Time statistics for %s version %d.%d : %s", rs->prog, rs->ver&0xff, rs->ver>>8, get_basename(cfile.filename));
+	else
+		snprintf(title_string, 255, "DCE-RPC Service Response Time statistics for %s version %d.%d", rs->prog, rs->ver&0xff, rs->ver>>8);
 	gtk_window_set_title(GTK_WINDOW(rs->win), title_string);
 	SIGNAL_CONNECT(rs->win, "destroy", win_destroy_cb, rs);
 
diff --git a/gtk/endpoint_talkers_table.c b/gtk/endpoint_talkers_table.c
index 79ef7ff41c..d9402df48b 100644
--- a/gtk/endpoint_talkers_table.c
+++ b/gtk/endpoint_talkers_table.c
@@ -4,7 +4,7 @@
  * endpoint_talkers_table   2003 Ronnie Sahlberg
  * Helper routines common to all endpoint talkers tap.
  *
- * $Id: endpoint_talkers_table.c,v 1.16 2003/09/05 06:16:09 sahlberg Exp $
+ * $Id: endpoint_talkers_table.c,v 1.17 2003/09/15 19:05:00 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -206,7 +206,10 @@ reset_ett_table_data(endpoints_table *et)
 	guint32 i;
 	char title[256];
 
-	snprintf(title, 255, "%s Conversations: %s", et->name, get_basename(cfile.filename));
+	if (cfile.filename)
+		snprintf(title, 255, "%s Conversations: %s", et->name, get_basename(cfile.filename));
+	else
+		snprintf(title, 255, "%s Conversations", et->name);
 	gtk_window_set_title(GTK_WINDOW(et->win), title);
 
 	/* remove all entries from the clist */
@@ -881,7 +884,10 @@ init_ett_table(gboolean hide_ports, char *table_name, char *tap_name, char *filt
 	talkers->name=table_name;
 	talkers->win=gtk_window_new(GTK_WINDOW_TOPLEVEL);
 	gtk_window_set_default_size(GTK_WINDOW(talkers->win), 750, 400);
-	snprintf(title, 255, "%s Conversations: %s", table_name, get_basename(cfile.filename));
+	if (cfile.filename)
+		snprintf(title, 255, "%s Conversations: %s", table_name, get_basename(cfile.filename));
+	else
+		snprintf(title, 255, "%s Conversations", table_name);
 	gtk_window_set_title(GTK_WINDOW(talkers->win), title);
 
 	SIGNAL_CONNECT(talkers->win, "destroy", ett_win_destroy_cb, talkers);
diff --git a/gtk/fc_stat.c b/gtk/fc_stat.c
index 549d5038f6..980a6e830e 100644
--- a/gtk/fc_stat.c
+++ b/gtk/fc_stat.c
@@ -1,7 +1,7 @@
 /* fc_stat.c
  * fc_stat   2003 Ronnie Sahlberg
  *
- * $Id: fc_stat.c,v 1.5 2003/09/05 10:26:44 sahlberg Exp $
+ * $Id: fc_stat.c,v 1.6 2003/09/15 19:05:00 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -65,7 +65,10 @@ fcstat_reset(void *pfc)
 	char title[256];
 
 	reset_srt_table_data(&fc->fc_srt_table);
-	snprintf(title, 255, "Fibre Channel Service Response Time statistics : %s", get_basename(cfile.filename));
+	if (cfile.filename)
+		snprintf(title, 255, "Fibre Channel Service Response Time statistics : %s", get_basename(cfile.filename));
+	else
+		snprintf(title, 255, "Fibre Channel Service Response Time statistics");
 	gtk_window_set_title(GTK_WINDOW(fc->win), title);
 }
 
@@ -138,7 +141,10 @@ gtk_fcstat_init(char *optarg)
 
 	fc->win=gtk_window_new(GTK_WINDOW_TOPLEVEL);
 	gtk_window_set_default_size(GTK_WINDOW(fc->win), 550, 400);
-	snprintf(title, 255, "Fibre Channel Service Response Time statistics : %s", get_basename(cfile.filename));
+	if (cfile.filename)
+		snprintf(title, 255, "Fibre Channel Service Response Time statistics : %s", get_basename(cfile.filename));
+	else
+		snprintf(title, 255, "Fibre Channel Service Response Time statistics");
 	gtk_window_set_title(GTK_WINDOW(fc->win), title);
 	SIGNAL_CONNECT(fc->win, "destroy", win_destroy_cb, fc);
 
diff --git a/gtk/io_stat.c b/gtk/io_stat.c
index 0cb4565551..d58ebc50a7 100644
--- a/gtk/io_stat.c
+++ b/gtk/io_stat.c
@@ -1,7 +1,7 @@
 /* io_stat.c
  * io_stat   2002 Ronnie Sahlberg
  *
- * $Id: io_stat.c,v 1.23 2003/09/02 08:27:33 sahlberg Exp $
+ * $Id: io_stat.c,v 1.24 2003/09/15 19:05:00 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -224,7 +224,10 @@ gtk_iostat_reset(void *g)
 	gio->io->last_interval=0xffffffff;
 	gio->io->max_interval=0;
 
-	snprintf(title, 255, "IO-Stat: %s", get_basename(cfile.filename));
+	if (cfile.filename)
+		snprintf(title, 255, "IO-Stat: %s", get_basename(cfile.filename));
+	else
+		snprintf(title, 255, "IO-Stat");
 	gtk_window_set_title(GTK_WINDOW(gio->io->window), title);
 }
 
@@ -1643,7 +1646,10 @@ init_io_stat_window(io_stat_t *io)
 	create_ctrl_area(io, hbox);
 
 	gtk_widget_show(io->window);
-	snprintf(title, 255, "IO-Stat: %s", get_basename(cfile.filename));
+	if (cfile.filename)
+		snprintf(title, 255, "IO-Stat: %s", get_basename(cfile.filename));
+	else
+		snprintf(title, 255, "IO-Stat");
 	gtk_window_set_title(GTK_WINDOW(io->window), title);
 }
 
diff --git a/gtk/mgcp_stat.c b/gtk/mgcp_stat.c
index 0f05fe7841..e3833c4749 100644
--- a/gtk/mgcp_stat.c
+++ b/gtk/mgcp_stat.c
@@ -2,7 +2,7 @@
  * mgcp-statistics for ethereal
  * Copyright 2003 Lars Roland
  *
- * $Id: mgcp_stat.c,v 1.9 2003/09/02 08:27:38 sahlberg Exp $
+ * $Id: mgcp_stat.c,v 1.10 2003/09/15 19:05:00 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -110,7 +110,12 @@ mgcpstat_reset(void *pms)
 	ms->req_dup_num=0;
 	ms->rsp_dup_num=0;
 
-	snprintf(title, 255, "MGCP SRT Statistics: %s", get_basename(cfile.filename));
+	if (cfile.filename)
+		snprintf(title, 255, "MGCP SRT Statistics: %s", get_basename(cfile.filename));
+	else
+		snprintf(title, 255, "MGCP SRT Statistics");
+	if (! dlg)
+		dlg=gtk_window_new(GTK_WINDOW_TOPLEVEL);
 	gtk_window_set_title(GTK_WINDOW(dlg), title);
 }
 
@@ -345,7 +350,10 @@ gtk_mgcpstat_cb(GtkWidget *w _U_, gpointer d _U_)
 	}
 
 	dlg=gtk_window_new(GTK_WINDOW_TOPLEVEL);
-	snprintf(title, 255, "MGCP SRT Statistics: %s", get_basename(cfile.filename));
+	if (cfile.filename)
+		snprintf(title, 255, "MGCP SRT Statistics: %s", get_basename(cfile.filename));
+	else
+		snprintf(title, 255, "MGCP SRT Statistics");
 	gtk_window_set_title(GTK_WINDOW(dlg), title);
 	SIGNAL_CONNECT(dlg, "destroy", dlg_destroy_cb, NULL);
 	dlg_box=gtk_vbox_new(FALSE, 0);
diff --git a/gtk/rpc_stat.c b/gtk/rpc_stat.c
index 4419192422..3bcdbbcafc 100644
--- a/gtk/rpc_stat.c
+++ b/gtk/rpc_stat.c
@@ -1,7 +1,7 @@
 /* rpc_stat.c
  * rpc_stat   2002 Ronnie Sahlberg
  *
- * $Id: rpc_stat.c,v 1.16 2003/09/05 10:26:44 sahlberg Exp $
+ * $Id: rpc_stat.c,v 1.17 2003/09/15 19:05:01 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -66,7 +66,10 @@ rpcstat_reset(rpcstat_t *rs)
 
 	reset_srt_table_data(&rs->srt_table);
 
-	snprintf(title_string, 256, "ONC-RPC Service Response Time statistics for %s version %d : %s", rs->prog, rs->version, get_basename(cfile.filename));
+	if (cfile.filename)
+		snprintf(title_string, 256, "ONC-RPC Service Response Time statistics for %s version %d : %s", rs->prog, rs->version, get_basename(cfile.filename));
+	else
+		snprintf(title_string, 256, "ONC-RPC Service Response Time statistics for %s version %d", rs->prog, rs->version);
 	gtk_window_set_title(GTK_WINDOW(rs->win), title_string);
 }
 
@@ -216,7 +219,10 @@ gtk_rpcstat_init(char *optarg)
 
 	rs->win=gtk_window_new(GTK_WINDOW_TOPLEVEL);
 	gtk_window_set_default_size(GTK_WINDOW(rs->win), 550, 400);
-	snprintf(title_string, 256, "ONC-RPC Service Response Time statistics for %s version %d : %s", rs->prog, rs->version, get_basename(cfile.filename));
+	if (cfile.filename)
+		snprintf(title_string, 256, "ONC-RPC Service Response Time statistics for %s version %d : %s", rs->prog, rs->version, get_basename(cfile.filename));
+	else
+		snprintf(title_string, 256, "ONC-RPC Service Response Time statistics for %s version %d", rs->prog, rs->version);
 	gtk_window_set_title(GTK_WINDOW(rs->win), title_string);
 	SIGNAL_CONNECT(rs->win, "destroy", win_destroy_cb, rs);
 
diff --git a/gtk/smb_stat.c b/gtk/smb_stat.c
index d5a2d4a8e2..8801f7fd8c 100644
--- a/gtk/smb_stat.c
+++ b/gtk/smb_stat.c
@@ -1,7 +1,7 @@
 /* smb_stat.c
  * smb_stat   2003 Ronnie Sahlberg
  *
- * $Id: smb_stat.c,v 1.13 2003/09/05 10:26:44 sahlberg Exp $
+ * $Id: smb_stat.c,v 1.14 2003/09/15 19:05:01 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -69,7 +69,10 @@ smbstat_reset(void *pss)
 	reset_srt_table_data(&ss->smb_srt_table);
 	reset_srt_table_data(&ss->trans2_srt_table);
 	reset_srt_table_data(&ss->nt_trans_srt_table);
-	snprintf(title, 255, "SMB Service Response Time statistics: %s", get_basename(cfile.filename));
+	if (cfile.filename)
+		snprintf(title, 255, "SMB Service Response Time statistics: %s", get_basename(cfile.filename));
+	else
+		snprintf(title, 255, "SMB Service Response Time statistics");
 	gtk_window_set_title(GTK_WINDOW(ss->win), title);
 }
 
@@ -156,7 +159,10 @@ gtk_smbstat_init(char *optarg)
 
 	ss->win=gtk_window_new(GTK_WINDOW_TOPLEVEL);
 	gtk_window_set_default_size(GTK_WINDOW(ss->win), 550, 600);
-	snprintf(title, 255, "SMB Service Response Time statistics: %s", get_basename(cfile.filename));
+	if (cfile.filename)
+		snprintf(title, 255, "SMB Service Response Time statistics: %s", get_basename(cfile.filename));
+	else
+		snprintf(title, 255, "SMB Service Response Time statistics");
 	gtk_window_set_title(GTK_WINDOW(ss->win), title);
 	SIGNAL_CONNECT(ss->win, "destroy", win_destroy_cb, ss);