diff options
| author | Guy Harris <guy@alum.mit.edu> | 2004-02-13 00:53:37 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2004-02-13 00:53:37 +0000 |
| commit | 36ece5a17ad804d3c6e668af1bb254e8d3e67b48 (patch) | |
| tree | 12528c3d9b2df330cfe374963bb02901ea4dbdce /gtk/follow_dlg.c | |
| parent | 5f27347dfa71ce05f77aa14cf6a89f1bfb2e6914 (diff) | |
| download | wireshark-36ece5a17ad804d3c6e668af1bb254e8d3e67b48.tar.gz | |
Add a "window_new()" routine that creates a window of a given type, sets
the title, and arranges to set the icon for it. Use that instead of
"gtk_window_new()" and separate calls to set the title and arrange to
set the icon.
Regularize #includes a bit.
Clean up white space.
svn path=/trunk/; revision=10054
Diffstat (limited to 'gtk/follow_dlg.c')
| -rw-r--r-- | gtk/follow_dlg.c | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/gtk/follow_dlg.c b/gtk/follow_dlg.c index ebb55a577a..a04f9376d7 100644 --- a/gtk/follow_dlg.c +++ b/gtk/follow_dlg.c @@ -1,6 +1,6 @@ /* follow_dlg.c * - * $Id: follow_dlg.c,v 1.45 2004/02/11 01:37:12 guy Exp $ + * $Id: follow_dlg.c,v 1.46 2004/02/13 00:53:35 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -242,7 +242,13 @@ follow_stream_cb(GtkWidget * w, gpointer data _U_) fclose(data_out_file); /* The data_out_filename file now has all the text that was in the session */ - streamwindow = gtk_window_new(GTK_WINDOW_TOPLEVEL); + if (incomplete_tcp_stream) { + streamwindow = window_new(GTK_WINDOW_TOPLEVEL, + "Contents of TCP stream (incomplete)"); + } else { + streamwindow = window_new(GTK_WINDOW_TOPLEVEL, + "Contents of TCP stream"); + } /* needed in follow_filter_out_stream(), is there a better way? */ follow_info->streamwindow = streamwindow; @@ -250,14 +256,6 @@ follow_stream_cb(GtkWidget * w, gpointer data _U_) gtk_widget_set_name(streamwindow, "TCP stream window"); SIGNAL_CONNECT(streamwindow, "destroy", follow_destroy_cb, NULL); - SIGNAL_CONNECT(streamwindow, "realize", window_icon_realize_cb, NULL); - if (incomplete_tcp_stream) { - gtk_window_set_title(GTK_WINDOW(streamwindow), - "Contents of TCP stream (incomplete)"); - } else { - gtk_window_set_title(GTK_WINDOW(streamwindow), - "Contents of TCP stream"); - } WIDGET_SET_SIZE(streamwindow, DEF_WIDTH, DEF_HEIGHT); gtk_container_border_width(GTK_CONTAINER(streamwindow), 2); |