diff options
| author | Gerald Combs <gerald@wireshark.org> | 2003-12-12 02:50:04 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2003-12-12 02:50:04 +0000 |
| commit | 9ed6beff38a0551f5e63bd6260155272e06158b0 (patch) | |
| tree | 2dac75ec3f064a1ef718c262e18c50703b3c121d /gtk | |
| parent | 10e3320115a0fd419829016e29a62ca806081878 (diff) | |
In "dlg_window_new()" check to see if "top_level" has been initialized,
as is the case for the spawned capture process.
svn path=/trunk/; revision=9245
Diffstat (limited to 'gtk')
| -rw-r--r-- | gtk/dlg_utils.c | 6 | ||||
| -rw-r--r-- | gtk/main.c | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/gtk/dlg_utils.c b/gtk/dlg_utils.c index 4149bcc9a6..3c13f1ea8b 100644 --- a/gtk/dlg_utils.c +++ b/gtk/dlg_utils.c @@ -1,7 +1,7 @@ /* dlg_utils.c * Utilities to use when constructing dialogs * - * $Id: dlg_utils.c,v 1.12 2003/09/24 08:43:34 guy Exp $ + * $Id: dlg_utils.c,v 1.13 2003/12/12 02:50:04 gerald Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -51,7 +51,9 @@ dlg_window_new(const gchar *title) win = gtk_window_new(GTK_WINDOW_TOPLEVEL); gtk_window_set_position(GTK_WINDOW(win), GTK_WIN_POS_CENTER_ON_PARENT); #endif - gtk_window_set_transient_for(GTK_WINDOW(win), GTK_WINDOW(top_level)); + if (top_level) { + gtk_window_set_transient_for(GTK_WINDOW(win), GTK_WINDOW(top_level)); + } gtk_window_set_title(GTK_WINDOW(win), title); SIGNAL_CONNECT(win, "realize", window_icon_realize_cb, NULL); return win; diff --git a/gtk/main.c b/gtk/main.c index 3396d7e054..32ba963a6b 100644 --- a/gtk/main.c +++ b/gtk/main.c @@ -1,6 +1,6 @@ /* main.c * - * $Id: main.c,v 1.338 2003/12/09 06:48:40 guy Exp $ + * $Id: main.c,v 1.339 2003/12/12 02:50:04 gerald Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -133,7 +133,7 @@ typedef struct column_arrows { capture_file cfile; GtkWidget *main_display_filter_widget=NULL; -GtkWidget *top_level, *packet_list, *tree_view, *byte_nb_ptr, +GtkWidget *top_level = NULL, *packet_list, *tree_view, *byte_nb_ptr, *tv_scrollw, *pkt_scrollw; static GtkWidget *info_bar; #if GTK_MAJOR_VERSION < 2 |