g_filename_display_basename() returns a g_mallocated string, so its

callers either need to free it or their callers need to free it or....

This means that cf_get_display_name() must always return a g_mallocated
string and its callers or... must free it.

For some of those callers, create a new set_window_title() routine to do
the work - they're all using the same pattern.

svn path=/trunk/; revision=43047

1 files changed, 10 insertions, 2 deletions

diff --git a/ui/gtk/sctp_chunk_stat_dlg.c b/ui/gtk/sctp_chunk_stat_dlg.c
index 4c2b4d3786..ed6860a2d7 100644
--- a/ui/gtk/sctp_chunk_stat_dlg.c
+++ b/ui/gtk/sctp_chunk_stat_dlg.c
@@ -580,12 +580,16 @@ on_close_dlg (GtkButton *button _U_, gpointer user_data)
 static void
 path_window_set_title(struct sctp_udata *u_data, unsigned int direction)
 {
+    char *display_name;
     char *title;
+
     if(!u_data->io->window){
         return;
     }
+    display_name = cf_get_display_name(&cfile);
     title = g_strdup_printf("SCTP Path Chunk Statistics for Endpoint %u: %s Port1 %u  Port2 %u",direction,
-                            cf_get_display_name(&cfile), u_data->assoc->port1, u_data->assoc->port2);
+                            display_name, u_data->assoc->port1, u_data->assoc->port2);
+    g_free(display_name);
     gtk_window_set_title(GTK_WINDOW(u_data->io->window), title);
     g_free(title);
 }
@@ -646,12 +650,16 @@ gtk_sctpstat_dlg(struct sctp_udata *u_data, unsigned int direction)
 static void
 chunk_window_set_title(struct sctp_udata *u_data)
 {
+    char *display_name;
     char *title;
+
     if(!u_data->io->window){
         return;
     }
+    display_name = cf_get_display_name(&cfile);
     title = g_strdup_printf("SCTP Association Chunk Statistics: %s Port1 %u  Port2 %u",
-                            cf_get_display_name(&cfile), u_data->assoc->port1, u_data->assoc->port2);
+                            display_name, u_data->assoc->port1, u_data->assoc->port2);
+    g_free(display_name);
     gtk_window_set_title(GTK_WINDOW(u_data->io->window), title);
     g_free(title);
 }